December 2015 - netsurf-commits - listmaster.pepperfish.net

netsurf: branch chris/splay updated. release/3.3-551-g6fb166f

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/netsurf.git/shortlog/6fb166f2e89b75e24f222... ...commit http://git.netsurf-browser.org/netsurf.git/commit/6fb166f2e89b75e24f2225d... ...tree http://git.netsurf-browser.org/netsurf.git/tree/6fb166f2e89b75e24f2225dc8... The branch, chris/splay has been updated via 6fb166f2e89b75e24f2225dc861537c6a4640049 (commit) via 881d0ac4865a3b4b49c8b233e916732346a193cb (commit) via 237ec692ddb58d41a12dffc12b31914252391209 (commit) via d1c1392601891edd9a6972f729e5673fc74ad38b (commit) via 3dd9c59dbeb5b2598838cff0018d4f07fd2c67ec (commit) via 3e852daaf44090f87f3e7c710f18af8240a1dc6e (commit) from b013efa88ce00b571fd26c569baf9c46511d4613 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=6fb166f2e89b75e24f2... commit 6fb166f2e89b75e24f2225dc861537c6a4640049 Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk> Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk> Fix OS3 build diff --git a/amiga/Makefile.target b/amiga/Makefile.target index e6ba70d..1db9a87 100644 --- a/amiga/Makefile.target +++ b/amiga/Makefile.target @@ -76,7 +76,7 @@ S_AMIGA := 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_bitmap.c \ - selectmenu.c hash/xxhash.c splaytree.c splaytree.h + selectmenu.c hash/xxhash.c splaytree.c S_AMIGA := $(addprefix amiga/,$(S_AMIGA)) # This is the final source build list diff --git a/amiga/font.c b/amiga/font.c index e051356..820b182 100644 --- a/amiga/font.c +++ b/amiga/font.c @@ -22,6 +22,7 @@ #ifndef __amigaos4__ #include <proto/bullet.h> +#include "amiga/splaytree.h" #endif #include <proto/diskfont.h> #include <proto/exec.h> commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=881d0ac4865a3b4b49c... commit 881d0ac4865a3b4b49c8b233e916732346a193cb Merge: 3dd9c59 237ec69 Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk> Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk> Merge remote-tracking branch 'origin/master' into chris/splay commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=3dd9c59dbeb5b259883... commit 3dd9c59dbeb5b2598838cff0018d4f07fd2c67ec Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk> Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk> Function required under OS3 too diff --git a/amiga/font.c b/amiga/font.c index fb40f97..e051356 100644 --- a/amiga/font.c +++ b/amiga/font.c @@ -899,14 +899,12 @@ void ami_font_savescanner(void) ami_font_scan_save(nsoption_charp(font_unicode_file), glypharray); } -#ifdef __amigaos4__ static LONG ami_font_cache_sort(struct Hook *hook, APTR key1, APTR key2) { if(key1 == key2) return 0; if(key1 < key2) return -1; return 1; } -#endif #if 0 // TODO: Rewrite to page through the LRU list as splay trees don't let us do this */ ----------------------------------------------------------------------- Summary of changes: amiga/Makefile.target | 2 +- amiga/font.c | 3 +-- amiga/gui.c | 2 +- amiga/os3support.h | 3 +++ 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/amiga/Makefile.target b/amiga/Makefile.target index e6ba70d..1db9a87 100644 --- a/amiga/Makefile.target +++ b/amiga/Makefile.target @@ -76,7 +76,7 @@ S_AMIGA := 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_bitmap.c \ - selectmenu.c hash/xxhash.c splaytree.c splaytree.h + selectmenu.c hash/xxhash.c splaytree.c S_AMIGA := $(addprefix amiga/,$(S_AMIGA)) # This is the final source build list diff --git a/amiga/font.c b/amiga/font.c index fb40f97..820b182 100644 --- a/amiga/font.c +++ b/amiga/font.c @@ -22,6 +22,7 @@ #ifndef __amigaos4__ #include <proto/bullet.h> +#include "amiga/splaytree.h" #endif #include <proto/diskfont.h> #include <proto/exec.h> @@ -899,14 +900,12 @@ void ami_font_savescanner(void) ami_font_scan_save(nsoption_charp(font_unicode_file), glypharray); } -#ifdef __amigaos4__ static LONG ami_font_cache_sort(struct Hook *hook, APTR key1, APTR key2) { if(key1 == key2) return 0; if(key1 < key2) return -1; return 1; } -#endif #if 0 // TODO: Rewrite to page through the LRU list as splay trees don't let us do this */ diff --git a/amiga/gui.c b/amiga/gui.c index fe10385..5eab345 100644 --- a/amiga/gui.c +++ b/amiga/gui.c @@ -5532,7 +5532,7 @@ int main(int argc, char** argv) len += strlen(users_dir); len += 2; /* for poss path sep and NULL term */ - current_user_dir = AllocVecTags(len, NULL); + current_user_dir = AllocVecTagList(len, NULL); if(current_user_dir == NULL) { ami_misc_fatal_error("Failed to allocate memory"); ami_scheduler_process_delete(); diff --git a/amiga/os3support.h b/amiga/os3support.h index dddedb7..553dcb2 100644 --- a/amiga/os3support.h +++ b/amiga/os3support.h @@ -100,6 +100,9 @@ #define RAWKEY_CRSRRIGHT 0x4E #define RAWKEY_CRSRLEFT 0x4F #define RAWKEY_F5 0x54 +#define RAWKEY_F8 0x57 +#define RAWKEY_F9 0x58 +#define RAWKEY_F10 0x59 #define RAWKEY_HELP 0x5F #define RAWKEY_HOME 0x70 #define RAWKEY_END 0x71 -- NetSurf Browser

7 years, 9 months

1
0
0 / 0

netsurf: branch master updated. release/3.3-546-g237ec69

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/netsurf.git/shortlog/237ec692ddb58d41a12df... ...commit http://git.netsurf-browser.org/netsurf.git/commit/237ec692ddb58d41a12dffc... ...tree http://git.netsurf-browser.org/netsurf.git/tree/237ec692ddb58d41a12dffc12... The branch, master has been updated via 237ec692ddb58d41a12dffc12b31914252391209 (commit) via d1c1392601891edd9a6972f729e5673fc74ad38b (commit) from 3e852daaf44090f87f3e7c710f18af8240a1dc6e (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=237ec692ddb58d41a12... commit 237ec692ddb58d41a12dffc12b31914252391209 Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk> Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk> Fix OS3 build diff --git a/amiga/gui.c b/amiga/gui.c index fe10385..5eab345 100644 --- a/amiga/gui.c +++ b/amiga/gui.c @@ -5532,7 +5532,7 @@ int main(int argc, char** argv) len += strlen(users_dir); len += 2; /* for poss path sep and NULL term */ - current_user_dir = AllocVecTags(len, NULL); + current_user_dir = AllocVecTagList(len, NULL); if(current_user_dir == NULL) { ami_misc_fatal_error("Failed to allocate memory"); ami_scheduler_process_delete(); commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=d1c1392601891edd9a6... commit d1c1392601891edd9a6972f729e5673fc74ad38b Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk> Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk> Add missing rawkey codes diff --git a/amiga/os3support.h b/amiga/os3support.h index dddedb7..553dcb2 100644 --- a/amiga/os3support.h +++ b/amiga/os3support.h @@ -100,6 +100,9 @@ #define RAWKEY_CRSRRIGHT 0x4E #define RAWKEY_CRSRLEFT 0x4F #define RAWKEY_F5 0x54 +#define RAWKEY_F8 0x57 +#define RAWKEY_F9 0x58 +#define RAWKEY_F10 0x59 #define RAWKEY_HELP 0x5F #define RAWKEY_HOME 0x70 #define RAWKEY_END 0x71 ----------------------------------------------------------------------- Summary of changes: amiga/gui.c | 2 +- amiga/os3support.h | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/amiga/gui.c b/amiga/gui.c index fe10385..5eab345 100644 --- a/amiga/gui.c +++ b/amiga/gui.c @@ -5532,7 +5532,7 @@ int main(int argc, char** argv) len += strlen(users_dir); len += 2; /* for poss path sep and NULL term */ - current_user_dir = AllocVecTags(len, NULL); + current_user_dir = AllocVecTagList(len, NULL); if(current_user_dir == NULL) { ami_misc_fatal_error("Failed to allocate memory"); ami_scheduler_process_delete(); diff --git a/amiga/os3support.h b/amiga/os3support.h index dddedb7..553dcb2 100644 --- a/amiga/os3support.h +++ b/amiga/os3support.h @@ -100,6 +100,9 @@ #define RAWKEY_CRSRRIGHT 0x4E #define RAWKEY_CRSRLEFT 0x4F #define RAWKEY_F5 0x54 +#define RAWKEY_F8 0x57 +#define RAWKEY_F9 0x58 +#define RAWKEY_F10 0x59 #define RAWKEY_HELP 0x5F #define RAWKEY_HOME 0x70 #define RAWKEY_END 0x71 -- NetSurf Browser

7 years, 9 months

1
0
0 / 0

netsurf: branch master updated. release/3.3-544-g3e852da

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/netsurf.git/shortlog/3e852daaf44090f87f3e7... ...commit http://git.netsurf-browser.org/netsurf.git/commit/3e852daaf44090f87f3e7c7... ...tree http://git.netsurf-browser.org/netsurf.git/tree/3e852daaf44090f87f3e7c710... The branch, master has been updated via 3e852daaf44090f87f3e7c710f18af8240a1dc6e (commit) from 01953378acc753026660687b8b794bfa2bd8e637 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=3e852daaf44090f87f3... commit 3e852daaf44090f87f3e7c710f18af8240a1dc6e Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk> Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk> Missing initialisation diff --git a/amiga/gui.c b/amiga/gui.c index 43b1fb3..fe10385 100644 --- a/amiga/gui.c +++ b/amiga/gui.c @@ -798,7 +798,7 @@ static struct RDArgs *ami_gui_commandline(int *argc, char **argv, int *nargc, ch int new_argc = 1; struct RDArgs *args; CONST_STRPTR template = "-v/S,NSOPTS/M,URL/K,USERSDIR/K,FORCE/S"; - long rarray[] = {0,0,0,0}; + long rarray[] = {0,0,0,0,0}; enum { A_VERBOSE, /* ignored */ ----------------------------------------------------------------------- Summary of changes: amiga/gui.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/amiga/gui.c b/amiga/gui.c index 43b1fb3..fe10385 100644 --- a/amiga/gui.c +++ b/amiga/gui.c @@ -798,7 +798,7 @@ static struct RDArgs *ami_gui_commandline(int *argc, char **argv, int *nargc, ch int new_argc = 1; struct RDArgs *args; CONST_STRPTR template = "-v/S,NSOPTS/M,URL/K,USERSDIR/K,FORCE/S"; - long rarray[] = {0,0,0,0}; + long rarray[] = {0,0,0,0,0}; enum { A_VERBOSE, /* ignored */ -- NetSurf Browser

7 years, 9 months

1
0
0 / 0

netsurf: branch chris/splay created. release/3.3-545-gb013efa

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/netsurf.git/shortlog/b013efa88ce00b571fd26... ...commit http://git.netsurf-browser.org/netsurf.git/commit/b013efa88ce00b571fd26c5... ...tree http://git.netsurf-browser.org/netsurf.git/tree/b013efa88ce00b571fd26c569... The branch, chris/splay has been created at b013efa88ce00b571fd26c569baf9c46511d4613 (commit) - Log ----------------------------------------------------------------- commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=b013efa88ce00b571fd... commit b013efa88ce00b571fd26c569baf9c46511d4613 Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk> Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk> Splay tree test; incomplate; leaky; should work under OS3 diff --git a/amiga/Makefile.target b/amiga/Makefile.target index f422140..e6ba70d 100644 --- a/amiga/Makefile.target +++ b/amiga/Makefile.target @@ -76,7 +76,7 @@ S_AMIGA := 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_bitmap.c \ - selectmenu.c hash/xxhash.c + selectmenu.c hash/xxhash.c splaytree.c splaytree.h S_AMIGA := $(addprefix amiga/,$(S_AMIGA)) # This is the final source build list diff --git a/amiga/font.c b/amiga/font.c index 8848021..fb40f97 100644 --- a/amiga/font.c +++ b/amiga/font.c @@ -75,7 +75,7 @@ struct ami_font_node { #ifdef __amigaos4__ - struct SkipNode skip_node; + struct SplayNode splay_node; #endif struct OutlineFont *font; char *bold; @@ -151,11 +151,8 @@ const uint16 sc_table[] = { #endif 0, 0}; -#ifdef __amigaos4__ -struct SkipList *ami_font_list = NULL; -#else -struct MinList *ami_font_list = NULL; -#endif +struct SplayTree *ami_font_list = NULL; +//TODO struct MinList *ami_font_lru = NULL struct List ami_diskfontlib_list; lwc_string *glypharray[0xffff + 1]; ULONG ami_devicedpi; @@ -376,13 +373,8 @@ static struct ami_font_node *ami_font_open(const char *font, bool critical) struct ami_font_node *nodedata = NULL; uint32 hash = 0; -#ifdef __amigaos4__ hash = XXH32(font, strlen(font), 0); - nodedata = (struct ami_font_node *)FindSkipNode(ami_font_list, (APTR)hash); -#else - struct nsObject *node = (struct nsObject *)FindIName((struct List *)ami_font_list, font); - if(node) nodedata = node->objstruct; -#endif + nodedata = (struct ami_font_node *)FindSplayNode(ami_font_list, (APTR)hash); if(nodedata) { GetSysTime(&nodedata->lastused); @@ -391,11 +383,8 @@ static struct ami_font_node *ami_font_open(const char *font, bool critical) LOG("Font cache miss: %s (%lx)", font, hash); -#ifdef __amigaos4__ - nodedata = (struct ami_font_node *)InsertSkipNode(ami_font_list, (APTR)hash, sizeof(struct ami_font_node)); -#else - nodedata = AllocVecTagList(sizeof(struct ami_font_node), NULL); -#endif + nodedata = (struct ami_font_node *)InsertSplayNode(ami_font_list, (APTR)hash, sizeof(struct ami_font_node)); + /* TODO: add hash to LRU list */ if(nodedata == NULL) { warn_user("NoMemory", ""); @@ -432,14 +421,6 @@ static struct ami_font_node *ami_font_open(const char *font, bool critical) GetSysTime(&nodedata->lastused); -#ifndef __amigaos4__ - node = AddObject(ami_font_list, AMINS_FONT); - if(node) { - node->objstruct = nodedata; - node->dtz_Node.ln_Name = strdup(font); - } -#endif - return nodedata; } @@ -927,6 +908,8 @@ static LONG ami_font_cache_sort(struct Hook *hook, APTR key1, APTR key2) } #endif +#if 0 +// TODO: Rewrite to page through the LRU list as splay trees don't let us do this */ #ifdef __amigaos4__ static void ami_font_cleanup(struct SkipList *skiplist) { @@ -981,6 +964,7 @@ static void ami_font_cleanup(struct MinList *ami_font_list) ami_schedule(300000, (void *)ami_font_cleanup, ami_font_list); } #endif +#endif //0 void ami_init_fonts(void) { @@ -988,18 +972,17 @@ void ami_init_fonts(void) ami_font_initscanner(false, true); /* Initialise font caching etc lists */ -#ifdef __amigaos4__ ami_font_cache_hook.h_Entry = (HOOKFUNC)ami_font_cache_sort; ami_font_cache_hook.h_Data = 0; - ami_font_list = CreateSkipList(&ami_font_cache_hook, 8); -#else - ami_font_list = NewObjList(); -#endif + ami_font_list = CreateSplayTree(&ami_font_cache_hook); NewList(&ami_diskfontlib_list); /* run first cleanup in ten minutes */ +#if 0 +// TODO: Needs rewriting */ ami_schedule(600000, (void *)ami_font_cleanup, ami_font_list); +#endif } #ifdef __amigaos4__ @@ -1024,11 +1007,10 @@ static void ami_font_del_skiplist(struct SkipList *skiplist) void ami_close_fonts(void) { LOG("Cleaning up font cache"); +#if 0 +//TODO: rewrite this ami_schedule(-1, (void *)ami_font_cleanup, ami_font_list); -#ifdef __amigaos4__ - ami_font_del_skiplist(ami_font_list); -#else - FreeObjList(ami_font_list); + ami_font_del_splaytree(ami_font_list); #endif ami_font_list = NULL; ami_font_finiscanner(); diff --git a/amiga/splaytree.c b/amiga/splaytree.c new file mode 100644 index 0000000..5f610f7 --- /dev/null +++ b/amiga/splaytree.c @@ -0,0 +1,250 @@ +/** + * Copyright (c) 2015 Fredrik Wikstrom <fredrik(a)a500.org> + * + * This program 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; either version 2 of the License, or + * (at your option) any later version. + * + * This program 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, write to the Free Software Foundation, + * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifndef __amigaos4__ +#include "amiga/splaytree.h" +#include <proto/exec.h> +#include <proto/utility.h> + +struct SplayNode { + struct SplayNode *parent; + struct SplayNode *left; + struct SplayNode *right; + APTR key; + APTR data; +}; + +struct SplayTree { + APTR mempool; + struct Hook *hook; + struct SplayNode *root; +}; + +struct SplayTree *CreateSplayTree(struct Hook *hook) { + struct SplayTree *tree; + + tree = AllocMem(sizeof(*tree), MEMF_PUBLIC); + if (tree == NULL) + return NULL; + + tree->mempool = CreatePool(MEMF_PUBLIC, 4096, 1024); + if (tree->mempool == NULL) { + FreeMem(tree, sizeof(*tree)); + } + + tree->hook = hook; + tree->root = NULL; + + return tree; +} + +void DeleteSplayTree(struct SplayTree *tree) { + if (tree != NULL) { + DeletePool(tree->mempool); + FreeMem(tree, sizeof(*tree)); + } +} + +static void left_rotate(struct SplayTree *tree, struct SplayNode *sn) { + struct SplayNode *s2 = sn->right; + + if (s2 != NULL) { + sn->right = s2->left; + if (s2->left != NULL) + s2->left->parent = sn; + s2->parent = sn->parent; + } + + if (sn->parent == NULL) + tree->root = s2; + else if (sn == sn->parent->left) + sn->parent->left = s2; + else + sn->parent->right = s2; + + if (s2 != NULL) + s2->left = sn; + + sn->parent = s2; +} + +static void right_rotate(struct SplayTree *tree, struct SplayNode *sn) { + struct SplayNode *s2 = sn->left; + + if (s2 != NULL) { + sn->left = s2->right; + if (s2->right != NULL) + s2->right->parent = sn; + s2->parent = sn->parent; + } + + if (sn->parent == NULL) + tree->root = s2; + else if (sn == sn->parent->left) + sn->parent->left = s2; + else + sn->parent->right = s2; + + if (s2 != NULL) + s2->right = sn; + + sn->parent = s2; +} + +static void splay(struct SplayTree *tree, struct SplayNode *sn) { + while (sn->parent != NULL) { + if (sn->parent->parent == NULL) { + if (sn == sn->parent->left) + right_rotate(tree, sn->parent); + else + left_rotate(tree, sn->parent); + } else if (sn->parent == sn->parent->parent->left) { + if (sn == sn->parent->left) + right_rotate(tree, sn->parent->parent); + else + left_rotate(tree, sn->parent); + right_rotate(tree, sn->parent); + } else { + if (sn == sn->parent->left) + right_rotate(tree, sn->parent); + else + left_rotate(tree, sn->parent->parent); + left_rotate(tree, sn->parent); + } + } +} + +static struct SplayNode *find(struct SplayTree *tree, APTR key) { + struct SplayNode *sn = tree->root; + int res; + + while (sn != NULL) { + res = CallHookPkt(tree->hook, key, sn->key); + if (res > 0) + sn = sn->right; + else if (res < 0) + sn = sn->left; + else + break; + } + + return sn; +} + +static void replace(struct SplayTree *tree, struct SplayNode *sn, struct SplayNode *s2) { + if (sn->parent == NULL) + tree->root = s2; + else if (sn == sn->parent->left) + sn->parent->left = s2; + else + sn->parent->right = s2; + + if (s2 != NULL) + s2->parent = sn->parent; +} + +BOOL InsertSplayNode(struct SplayTree *tree, APTR key, APTR data) { + struct SplayNode *sn = tree->root; + struct SplayNode *parent = NULL; + int res; + + if (data == NULL) + return FALSE; + + while (sn != NULL) { + parent = sn; + res = CallHookPkt(tree->hook, key, sn->key); + if (res > 0) + sn = sn->right; + else + sn = sn->left; + } + + sn = AllocPooled(tree->mempool, sizeof(*sn)); + if (sn == NULL) + return FALSE; + + sn->parent = parent; + sn->left = NULL; + sn->right = NULL; + sn->key = key; + sn->data = data; + + if (parent == NULL) + tree->root = sn; + else { + res = CallHookPkt(tree->hook, sn->key, parent->key); + if (res > 0) + parent->right = sn; + else + parent->left = sn; + } + + splay(tree, sn); + + return TRUE; +} + +APTR FindSplayNode(struct SplayTree *tree, APTR key) { + struct SplayNode *sn; + + sn = find(tree, key); + if (sn == NULL) + return NULL; + + splay(tree, sn); + + return sn->data; +} + +BOOL RemoveSplayNode(struct SplayTree *tree, APTR key) { + struct SplayNode *sn; + + sn = find(tree, key); + if (sn == NULL) + return FALSE; + + splay(tree, sn); + + if (sn->left == NULL) + replace(tree, sn, sn->right); + else if (sn->right == NULL) + replace(tree, sn, sn->left); + else { + struct SplayNode *s2 = sn->right; + + while (s2->left != NULL) + s2 = s2->left; + + if (sn != s2->parent) { + replace(tree, s2, s2->right); + s2->right = sn->right; + s2->right->parent = s2; + } + + replace(tree, sn, s2); + s2->left = sn->left; + s2->left->parent = s2; + } + + FreePooled(tree->mempool, sn, sizeof(*sn)); + + return TRUE; +} +#endif //__amigaos4__ + diff --git a/amiga/splaytree.h b/amiga/splaytree.h new file mode 100644 index 0000000..c816336 --- /dev/null +++ b/amiga/splaytree.h @@ -0,0 +1,40 @@ +/** + * Copyright (c) 2015 Fredrik Wikstrom <fredrik(a)a500.org> + * + * This program 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; either version 2 of the License, or + * (at your option) any later version. + * + * This program 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, write to the Free Software Foundation, + * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifndef __amigaos4__ +#ifndef SPLAYTREE_H +#define SPLAYTREE_H + +#ifndef EXEC_TYPES_H +#include <exec/types.h> +#endif +#ifndef UTILITY_HOOKS_H +#include <utility/hooks.h> +#endif + +struct SplayTree; + +struct SplayTree *CreateSplayTree(struct Hook *hook); +void DeleteSplayTree(struct SplayTree *tree); +BOOL InsertSplayNode(struct SplayTree *tree, APTR key, APTR data); +APTR FindSplayNode(struct SplayTree *tree, APTR key); +BOOL RemoveSplayNode(struct SplayTree *tree, APTR key); + +#endif +#endif // __amigaos4__ + commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=98029890997b2099a8a... commit 98029890997b2099a8a5ca8e5132b94073017e49 Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk> Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk> Missing initialisation diff --git a/amiga/gui.c b/amiga/gui.c index 43b1fb3..fe10385 100644 --- a/amiga/gui.c +++ b/amiga/gui.c @@ -798,7 +798,7 @@ static struct RDArgs *ami_gui_commandline(int *argc, char **argv, int *nargc, ch int new_argc = 1; struct RDArgs *args; CONST_STRPTR template = "-v/S,NSOPTS/M,URL/K,USERSDIR/K,FORCE/S"; - long rarray[] = {0,0,0,0}; + long rarray[] = {0,0,0,0,0}; enum { A_VERBOSE, /* ignored */ ----------------------------------------------------------------------- -- NetSurf Browser

7 years, 9 months

1
0
0 / 0

netsurf: branch master updated. release/3.3-543-g0195337

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/netsurf.git/shortlog/01953378acc7530266606... ...commit http://git.netsurf-browser.org/netsurf.git/commit/01953378acc753026660687... ...tree http://git.netsurf-browser.org/netsurf.git/tree/01953378acc753026660687b8... The branch, master has been updated via 01953378acc753026660687b8b794bfa2bd8e637 (commit) from dbbf4ad648302120d0fbf1f17940830b1a8e3958 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=01953378acc75302666... commit 01953378acc753026660687b8b794bfa2bd8e637 Author: Michael Drake <tlsa(a)netsurf-browser.org> Commit: Michael Drake <tlsa(a)netsurf-browser.org> Squash warning: variable ‘exc’ set but not used diff --git a/javascript/duktape/Node.bnd b/javascript/duktape/Node.bnd index ef1a862..f237c87 100644 --- a/javascript/duktape/Node.bnd +++ b/javascript/duktape/Node.bnd @@ -250,6 +250,7 @@ method Node::normalize() %{ dom_exception exc; exc = dom_node_normalize(priv->node); + if (exc != DOM_NO_ERR) return 0; return 0; %} ----------------------------------------------------------------------- Summary of changes: javascript/duktape/Node.bnd | 1 + 1 file changed, 1 insertion(+) diff --git a/javascript/duktape/Node.bnd b/javascript/duktape/Node.bnd index ef1a862..f237c87 100644 --- a/javascript/duktape/Node.bnd +++ b/javascript/duktape/Node.bnd @@ -250,6 +250,7 @@ method Node::normalize() %{ dom_exception exc; exc = dom_node_normalize(priv->node); + if (exc != DOM_NO_ERR) return 0; return 0; %} -- NetSurf Browser

7 years, 9 months

1
0
0 / 0

netsurf: branch master updated. release/3.3-542-gdbbf4ad

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/netsurf.git/shortlog/dbbf4ad648302120d0fbf... ...commit http://git.netsurf-browser.org/netsurf.git/commit/dbbf4ad648302120d0fbf1f... ...tree http://git.netsurf-browser.org/netsurf.git/tree/dbbf4ad648302120d0fbf1f17... The branch, master has been updated via dbbf4ad648302120d0fbf1f17940830b1a8e3958 (commit) via a6226170dddc10deb24a3875edd16b69752c5515 (commit) from e5ddbd39344c0d9662416723e3f3544d96e0ed9e (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=dbbf4ad648302120d0f... commit dbbf4ad648302120d0fbf1f17940830b1a8e3958 Author: Michael Drake <tlsa(a)netsurf-browser.org> Commit: Michael Drake <tlsa(a)netsurf-browser.org> Add assert that we got a base URI from the node. diff --git a/javascript/duktape/Node.bnd b/javascript/duktape/Node.bnd index a610afa..ef1a862 100644 --- a/javascript/duktape/Node.bnd +++ b/javascript/duktape/Node.bnd @@ -47,9 +47,10 @@ getter Node::nodeName() getter Node::baseURI() %{ dom_exception exc; - dom_string *base; + dom_string *base = NULL; exc = dom_node_get_base(priv->node, &base); if (exc != DOM_NO_ERR) return 0; + assert(base != NULL); duk_push_lstring(ctx, dom_string_data(base), dom_string_length(base)); dom_string_unref(base); return 1; commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=a6226170dddc10deb24... commit a6226170dddc10deb24a3875edd16b69752c5515 Author: Michael Drake <tlsa(a)netsurf-browser.org> Commit: Michael Drake <tlsa(a)netsurf-browser.org> Actually do something with return value. diff --git a/gtk/tabs.c b/gtk/tabs.c index 0a19236..c28fe5e 100644 --- a/gtk/tabs.c +++ b/gtk/tabs.c @@ -153,6 +153,9 @@ nsgtk_tab_switch_page_after(GtkNotebook *notebook, gw = g_object_get_data(G_OBJECT(srcpage), "gui_window"); if ((gw != NULL) && (nsgtk_get_scaffold(gw) != NULL)) { error = nsgtk_scaffolding_new_tab(gw); + if (error != NSERROR_OK) { + LOG("Failed to open new tab."); + } } } } else { ----------------------------------------------------------------------- Summary of changes: gtk/tabs.c | 3 +++ javascript/duktape/Node.bnd | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/gtk/tabs.c b/gtk/tabs.c index 0a19236..c28fe5e 100644 --- a/gtk/tabs.c +++ b/gtk/tabs.c @@ -153,6 +153,9 @@ nsgtk_tab_switch_page_after(GtkNotebook *notebook, gw = g_object_get_data(G_OBJECT(srcpage), "gui_window"); if ((gw != NULL) && (nsgtk_get_scaffold(gw) != NULL)) { error = nsgtk_scaffolding_new_tab(gw); + if (error != NSERROR_OK) { + LOG("Failed to open new tab."); + } } } } else { diff --git a/javascript/duktape/Node.bnd b/javascript/duktape/Node.bnd index a610afa..ef1a862 100644 --- a/javascript/duktape/Node.bnd +++ b/javascript/duktape/Node.bnd @@ -47,9 +47,10 @@ getter Node::nodeName() getter Node::baseURI() %{ dom_exception exc; - dom_string *base; + dom_string *base = NULL; exc = dom_node_get_base(priv->node, &base); if (exc != DOM_NO_ERR) return 0; + assert(base != NULL); duk_push_lstring(ctx, dom_string_data(base), dom_string_length(base)); dom_string_unref(base); return 1; -- NetSurf Browser

7 years, 9 months

1
0
0 / 0

libdom: branch master updated. release/0.2.0-1-g2969044

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/libdom.git/shortlog/29690449912aa85b8b5bbd... ...commit http://git.netsurf-browser.org/libdom.git/commit/29690449912aa85b8b5bbd9a... ...tree http://git.netsurf-browser.org/libdom.git/tree/29690449912aa85b8b5bbd9a21... The branch, master has been updated via 29690449912aa85b8b5bbd9a2105b1afd082089d (commit) from 7442297ac8c3ca65c3dbb5c990e5fd4a23f8c4ec (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/libdom.git/commit/?id=29690449912aa85b8b5b... commit 29690449912aa85b8b5bbd9a2105b1afd082089d Author: Michael Drake <tlsa(a)netsurf-browser.org> Commit: Michael Drake <tlsa(a)netsurf-browser.org> Remove call to non-existant function. There was no implementation of dom_document_get_base, and call to it were trying to run code at 0x0. Replace with call to dom_document_get_uri instead. diff --git a/src/core/document.h b/src/core/document.h index 2837893..5cf5dc1 100644 --- a/src/core/document.h +++ b/src/core/document.h @@ -243,30 +243,6 @@ dom_exception _dom_document_set_text_content(dom_node_internal *node, _dom_node_set_user_data, \ _dom_node_get_user_data -/** \todo Unused! */ -/** - * The internal used vtable for document - */ -struct dom_document_protected_vtable { - struct dom_node_protect_vtable base; - dom_exception (*dom_document_get_base)(dom_document *doc, - dom_string **base_uri); - /* Get the document's base uri */ -}; - -typedef struct dom_document_protected_vtable dom_document_protected_vtable; - -/* Get the document's base URI */ -static inline dom_exception dom_document_get_base(dom_document *doc, - dom_string **base_uri) -{ - dom_node_internal *node = (dom_node_internal *) doc; - return ((dom_document_protected_vtable *) node->vtable)-> - dom_document_get_base(doc, base_uri); -} -#define dom_document_get_base(d, b) dom_document_get_base( \ - (dom_document *) (d), (dom_string **) (b)) - /* Following comes the protected vtable */ void _dom_document_destroy(dom_node_internal *node); dom_exception _dom_document_copy(dom_node_internal *old, diff --git a/src/core/node.c b/src/core/node.c index e0c686f..45db915 100644 --- a/src/core/node.c +++ b/src/core/node.c @@ -1370,7 +1370,7 @@ dom_exception _dom_node_get_base(dom_node_internal *node, struct dom_document *doc = node->owner; assert(doc != NULL); - return dom_document_get_base(doc, result); + return _dom_document_get_uri(doc, result); } /** ----------------------------------------------------------------------- Summary of changes: src/core/document.h | 24 ------------------------ src/core/node.c | 2 +- 2 files changed, 1 insertion(+), 25 deletions(-) diff --git a/src/core/document.h b/src/core/document.h index 2837893..5cf5dc1 100644 --- a/src/core/document.h +++ b/src/core/document.h @@ -243,30 +243,6 @@ dom_exception _dom_document_set_text_content(dom_node_internal *node, _dom_node_set_user_data, \ _dom_node_get_user_data -/** \todo Unused! */ -/** - * The internal used vtable for document - */ -struct dom_document_protected_vtable { - struct dom_node_protect_vtable base; - dom_exception (*dom_document_get_base)(dom_document *doc, - dom_string **base_uri); - /* Get the document's base uri */ -}; - -typedef struct dom_document_protected_vtable dom_document_protected_vtable; - -/* Get the document's base URI */ -static inline dom_exception dom_document_get_base(dom_document *doc, - dom_string **base_uri) -{ - dom_node_internal *node = (dom_node_internal *) doc; - return ((dom_document_protected_vtable *) node->vtable)-> - dom_document_get_base(doc, base_uri); -} -#define dom_document_get_base(d, b) dom_document_get_base( \ - (dom_document *) (d), (dom_string **) (b)) - /* Following comes the protected vtable */ void _dom_document_destroy(dom_node_internal *node); dom_exception _dom_document_copy(dom_node_internal *old, diff --git a/src/core/node.c b/src/core/node.c index e0c686f..45db915 100644 --- a/src/core/node.c +++ b/src/core/node.c @@ -1370,7 +1370,7 @@ dom_exception _dom_node_get_base(dom_node_internal *node, struct dom_document *doc = node->owner; assert(doc != NULL); - return dom_document_get_base(doc, result); + return _dom_document_get_uri(doc, result); } /** -- Document Object Model library

7 years, 9 months

1
0
0 / 0

netsurf: branch master updated. release/3.3-540-ge5ddbd3

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/netsurf.git/shortlog/e5ddbd39344c0d9662416... ...commit http://git.netsurf-browser.org/netsurf.git/commit/e5ddbd39344c0d966241672... ...tree http://git.netsurf-browser.org/netsurf.git/tree/e5ddbd39344c0d9662416723e... The branch, master has been updated via e5ddbd39344c0d9662416723e3f3544d96e0ed9e (commit) from 0492966c863bd38a3d9cee5e51da72a6dc860eee (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=e5ddbd39344c0d96624... commit e5ddbd39344c0d9662416723e3f3544d96e0ed9e Author: Michael Drake <tlsa(a)netsurf-browser.org> Commit: Michael Drake <tlsa(a)netsurf-browser.org> Remove unused variable. diff --git a/content/llcache.c b/content/llcache.c index e95eefb..894d0e0 100644 --- a/content/llcache.c +++ b/content/llcache.c @@ -1341,7 +1341,6 @@ llcache_process_metadata(llcache_object *object) size_t metadatalen = 0; nsurl *metadataurl; unsigned int line; - uint8_t *end; char *ln; int lnsize; @@ -1363,8 +1362,6 @@ llcache_process_metadata(llcache_object *object) return res; } - end = metadata + metadatalen; - LOG("Processing retrived data"); /* metadata line 1 is the url the metadata referrs to */ ----------------------------------------------------------------------- Summary of changes: content/llcache.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/content/llcache.c b/content/llcache.c index e95eefb..894d0e0 100644 --- a/content/llcache.c +++ b/content/llcache.c @@ -1341,7 +1341,6 @@ llcache_process_metadata(llcache_object *object) size_t metadatalen = 0; nsurl *metadataurl; unsigned int line; - uint8_t *end; char *ln; int lnsize; @@ -1363,8 +1362,6 @@ llcache_process_metadata(llcache_object *object) return res; } - end = metadata + metadatalen; - LOG("Processing retrived data"); /* metadata line 1 is the url the metadata referrs to */ -- NetSurf Browser

7 years, 9 months

1
0
0 / 0

netsurf: branch master updated. release/3.3-539-g0492966

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/netsurf.git/shortlog/0492966c863bd38a3d9ce... ...commit http://git.netsurf-browser.org/netsurf.git/commit/0492966c863bd38a3d9cee5... ...tree http://git.netsurf-browser.org/netsurf.git/tree/0492966c863bd38a3d9cee5e5... The branch, master has been updated via 0492966c863bd38a3d9cee5e51da72a6dc860eee (commit) from abf8d542b152e82eebe43aba7c9d97f347865685 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=0492966c863bd38a3d9... commit 0492966c863bd38a3d9cee5e51da72a6dc860eee Author: Michael Drake <tlsa(a)netsurf-browser.org> Commit: Michael Drake <tlsa(a)netsurf-browser.org> Remove erroneous redeclaration of variable in new scope. diff --git a/render/html_interaction.c b/render/html_interaction.c index 153e4f7..764d58a 100644 --- a/render/html_interaction.c +++ b/render/html_interaction.c @@ -924,7 +924,6 @@ void html_mouse_action(struct content *c, struct browser_window *bw, } } else if (mouse & BROWSER_MOUSE_PRESS_1) { - union html_selection_owner sel_owner; sel_owner.none = true; selection_clear(&html->sel, true); } ----------------------------------------------------------------------- Summary of changes: render/html_interaction.c | 1 - 1 file changed, 1 deletion(-) diff --git a/render/html_interaction.c b/render/html_interaction.c index 153e4f7..764d58a 100644 --- a/render/html_interaction.c +++ b/render/html_interaction.c @@ -924,7 +924,6 @@ void html_mouse_action(struct content *c, struct browser_window *bw, } } else if (mouse & BROWSER_MOUSE_PRESS_1) { - union html_selection_owner sel_owner; sel_owner.none = true; selection_clear(&html->sel, true); } -- NetSurf Browser

7 years, 9 months

1
0
0 / 0

libnsbmp: annotated tag release/0.1.3 created. release/0.1.3

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/libnsbmp.git/shortlog/fefa8b208f27cd25216d... ...commit http://git.netsurf-browser.org/libnsbmp.git/commit/fefa8b208f27cd25216db1... ...tree http://git.netsurf-browser.org/libnsbmp.git/tree/fefa8b208f27cd25216db1d3... The annotated tag, release/0.1.3 has been created at fefa8b208f27cd25216db1d3d5fd41dd9f283f42 (tag) tagging a44819c36f45f3a0a2d387210d0c2f6b5eb577d9 (commit) replaces release/0.1.2 tagged by Vincent Sanders on Fri Dec 18 11:46:51 2015 +0000 - Log ----------------------------------------------------------------- Official Release -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iQIVAwUAVnPyK3mwx6LL2TueAQJeSA//T6Ujsigdett1nfSwv61ijzkLnJPTaMhU 9nqnc2VJTbUtQMFrcxjQdpjItkw8pWuwD8zmbOp1777OARyCfD/Tg+7waYF95G/N I4I8g6qC9BwSVkTvebAByjjFNx/DdNI9FcLSBE6+U5vjhlMLRu53kTmIf5Urygp8 QKilsnIPkokFhPgFteKOlBb3a19KNjtxjK2H5w7a3mPmpiT8tgfN5h274lq8ywe6 /3QiiCSjfwJELybHaZWriTjWtZLvjXcTKtGqyw0B/N2mPn2ZBTVPhSqCdIcp49ca GCXc/veEzoWToxPfSuV+GjkxYh8o9yNILEHkVzvNSFd56N6ZMw9x7resmi9hRjCG l9U8WOOKqqNF8ZYc50RwpuwrtOrKwaFMs2AqugeXLjlvro4k/+8r+r9pB6q1gixY JpweFlplP7X2QYRQBQOiYF+ElZiHUHpS5oIqGxT+ZCRp3mmYpYduzqm8tlzwcm6y 6G9FgygGESgoskR/3Aj1ntPHxmztjqWD8/kAdfuMYDNsb0B/B8ZW1QDvUwqJi5EJ SXFahMhMgc1tiKFja+QXZM1+Yy0cW1+G/YD23A89ziudkkjddJffQsZGFIcddO+c l9NaXh5vc+Jq8vpuBHmy4TOeQ82VWWCAOoF3BdxRK2iaRRTt52khTSd3ek/9H5sy KHAl/pmpI1k= =+E+5 -----END PGP SIGNATURE----- Adrien Destugues (1): Fix paths for Haiku. John-Mark Bell (3): Trivial spelling fix Fix pixels_left calculation in RLE decoding. Range check colour table accesses. Vincent Sanders (5): Update CFLAGS to avoid deprication warning for glibc 2.21 and later. Caused a syntax error in previous commit while altering CFLAGS add decode test suite test decoding of ico files Update Component version for release ----------------------------------------------------------------------- -- NetSurf BMP Decoder

7 years, 9 months

1
0
0 / 0

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

netsurf-commits December 2015