Gitweb links: ...log http://git.netsurf-browser.org/netsurf.git/shortlog/32c4fdeead33e9106343f... ...commit http://git.netsurf-browser.org/netsurf.git/commit/32c4fdeead33e9106343f91... ...tree http://git.netsurf-browser.org/netsurf.git/tree/32c4fdeead33e9106343f91d7... The branch, master has been updated via 32c4fdeead33e9106343f91d76072d00b47565e3 (commit) via 792e8881696147755dfae2a38364061926404706 (commit) via 7604b76161b16d11a4d70859a03a1c40d415a7ce (commit) from 29356734eb6d537d606a5f00c040b3619d061519 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commitdiff http://git.netsurf-browser.org/netsurf.git/commitdiff/32c4fdeead33e910634... commit 32c4fdeead33e9106343f91d76072d00b47565e3 Author: Vincent Sanders <vince(a)netsurf-browser.org&gt; Commit: Vincent Sanders <vince(a)netsurf-browser.org&gt; add includes to get browser private struct on atari diff --git a/atari/browser.c b/atari/browser.c index 0c043b3..f88610a 100755 --- a/atari/browser.c +++ b/atari/browser.c @@ -34,6 +34,7 @@ #include "desktop/gui.h" #include "desktop/netsurf.h" #include "desktop/browser.h" +#include "desktop/browser_private.h" #include "desktop/mouse.h" #include "desktop/textinput.h" #include "content/content.h" diff --git a/atari/browser_win.c b/atari/browser_win.c index 1babbad..9887083 100755 --- a/atari/browser_win.c +++ b/atari/browser_win.c @@ -34,6 +34,7 @@ #include "desktop/history_core.h" #include "desktop/netsurf.h" #include "desktop/browser.h" +#include "desktop/browser_private.h" #include "desktop/mouse.h" #include "desktop/plotters.h" #include "desktop/textinput.h" diff --git a/atari/ctxmenu.c b/atari/ctxmenu.c index 2230e00..79395ca 100644 --- a/atari/ctxmenu.c +++ b/atari/ctxmenu.c @@ -28,6 +28,7 @@ #include "desktop/gui.h" #include "desktop/netsurf.h" #include "desktop/browser.h" +#include "desktop/browser_private.h" #include "desktop/mouse.h" #include "desktop/textinput.h" #include "content/content.h" diff --git a/atari/global_evnt.c b/atari/global_evnt.c index f002f3f..1a0e8f6 100755 --- a/atari/global_evnt.c +++ b/atari/global_evnt.c @@ -28,6 +28,7 @@ #include "desktop/gui.h" #include "desktop/netsurf.h" #include "desktop/browser.h" +#include "desktop/browser_private.h" #include "desktop/mouse.h" #include "desktop/textinput.h" #include "desktop/hotlist.h" diff --git a/atari/gui.c b/atari/gui.c index 8142394..e500ad6 100755 --- a/atari/gui.c +++ b/atari/gui.c @@ -46,6 +46,7 @@ #include "desktop/selection.h" #include "desktop/textinput.h" #include "desktop/browser.h" +#include "desktop/browser_private.h" #include "desktop/mouse.h" #include "render/font.h" #include "utils/schedule.h" diff --git a/atari/toolbar.c b/atari/toolbar.c index b6dc468..3594d24 100755 --- a/atari/toolbar.c +++ b/atari/toolbar.c @@ -33,6 +33,7 @@ #include "desktop/history_core.h" #include "desktop/netsurf.h" #include "desktop/browser.h" +#include "desktop/browser_private.h" #include "desktop/mouse.h" #include "desktop/plot_style.h" #include "desktop/plotters.h" commitdiff http://git.netsurf-browser.org/netsurf.git/commitdiff/792e8881696147755df... commit 792e8881696147755dfae2a38364061926404706 Author: Vincent Sanders <vince(a)netsurf-browser.org&gt; Commit: Vincent Sanders <vince(a)netsurf-browser.org&gt; remove comment after checking correctness of sources diff --git a/javascript/jsapi/htmldocument.c b/javascript/jsapi/htmldocument.c index 1a58e4e..260f368 100644 --- a/javascript/jsapi/htmldocument.c +++ b/javascript/jsapi/htmldocument.c @@ -25,9 +25,6 @@ /* IDL http://www.whatwg.org/specs/web-apps/current-work/#the-document-object -NOTE - this interface is not from the DOM specifications but from the -html5 spec. I *think* thats right. - [OverrideBuiltins] partial interface Document { // resource metadata management commitdiff http://git.netsurf-browser.org/netsurf.git/commitdiff/7604b76161b16d11a4d... commit 7604b76161b16d11a4d70859a03a1c40d415a7ce Author: Vincent Sanders <vince(a)netsurf-browser.org&gt; Commit: Vincent Sanders <vince(a)netsurf-browser.org&gt; make the framebuffer resource path setting better diff --git a/Makefile.defaults b/Makefile.defaults index 1347956..8ee569c 100644 --- a/Makefile.defaults +++ b/Makefile.defaults @@ -288,9 +288,7 @@ ifeq ($(TARGET),framebuffer) # Valid options: internal, freetype NETSURF_FB_FONTLIB := internal - # freetype compiled in font locations - NETSURF_FB_FONTPATH := /usr/share/fonts/truetype/ttf-dejavu:/usr/share/fonts/truetype/msttcorefonts - + # Default freetype font files NETSURF_FB_FONT_SANS_SERIF := DejaVuSans.ttf NETSURF_FB_FONT_SANS_SERIF_BOLD := DejaVuSans-Bold.ttf NETSURF_FB_FONT_SANS_SERIF_ITALIC := DejaVuSans-Oblique.ttf @@ -302,18 +300,19 @@ ifeq ($(TARGET),framebuffer) NETSURF_FB_FONT_CURSIVE := Comic_Sans_MS.ttf NETSURF_FB_FONT_FANTASY := Impact.ttf - # Framebuffer frontends may have differing root paths for resources - # As such, these specify the resource path and config path. - NETSURF_FB_RESPATH_linux := $(PREFIX)/share/netsurf/ - NETSURF_FB_RESPATH_able := (tftpboot)/ - NETSURF_FB_RESPATH_dummy := ./ - NETSURF_FB_RESPATH_sdl := $(PREFIX)/share/netsurf/ - NETSURF_FB_RESPATH_x := $(PREFIX)/share/netsurf/ - NETSURF_FB_RESPATH_vnc := $(PREFIX)/share/netsurf/ - - NETSURF_FRAMEBUFFER_RESOURCES = $(NETSURF_FB_RESPATH_$(NETSURF_FB_FRONTEND)) + # Default binary install path NETSURF_FRAMEBUFFER_BIN := $(PREFIX)/bin/ + # Default resource install path + NETSURF_FRAMEBUFFER_RESOURCES := $(PREFIX)/share/netsurf/ + + # Default framebuffer search path + NETSURF_FB_RESPATH := $${HOME}/.netsurf/:$${NETSURFRES}:$(NETSURF_FRAMEBUFFER_RESOURCES):./framebuffer/res + + # freetype compiled in font serch path + NETSURF_FB_FONTPATH := /usr/share/fonts/truetype/ttf-dejavu:/usr/share/fonts/truetype/msttcorefonts + + endif # ---------------------------------------------------------------------------- diff --git a/framebuffer/Makefile.target b/framebuffer/Makefile.target index 37341ee..974427a 100644 --- a/framebuffer/Makefile.target +++ b/framebuffer/Makefile.target @@ -21,7 +21,7 @@ NETSURF_FEATURE_GIF_CFLAGS := -DWITH_GIF CFLAGS += -Dnsframebuffer #resource path -CFLAGS += '-DNETSURF_FB_RESPATH="$(NETSURF_FB_RESPATH_$(NETSURF_FB_FRONTEND))"' +CFLAGS += '-DNETSURF_FB_RESPATH="$(NETSURF_FB_RESPATH)"' # compile time font locations CFLAGS += '-DNETSURF_FB_FONTPATH="$(NETSURF_FB_FONTPATH)"' diff --git a/framebuffer/gui.c b/framebuffer/gui.c index db0a9ef..e33df38 100644 --- a/framebuffer/gui.c +++ b/framebuffer/gui.c @@ -530,7 +530,7 @@ main(int argc, char** argv) setbuf(stderr, NULL); - respaths = fb_init_resource("${HOME}/.netsurf/:${NETSURFRES}:"NETSURF_FB_RESPATH":./framebuffer/res:"NETSURF_FB_FONTPATH); + respaths = fb_init_resource(NETSURF_FB_RESPATH":"NETSURF_FB_FONTPATH); options = filepath_find(respaths, "Choices"); messages = filepath_find(respaths, "messages"); ----------------------------------------------------------------------- Summary of changes: Makefile.defaults | 25 ++++++++++++------------- atari/browser.c | 1 + atari/browser_win.c | 1 + atari/ctxmenu.c | 1 + atari/global_evnt.c | 1 + atari/gui.c | 1 + atari/toolbar.c | 1 + framebuffer/Makefile.target | 2 +- framebuffer/gui.c | 2 +- javascript/jsapi/htmldocument.c | 3 --- 10 files changed, 20 insertions(+), 18 deletions(-) diff --git a/Makefile.defaults b/Makefile.defaults index 1347956..8ee569c 100644 --- a/Makefile.defaults +++ b/Makefile.defaults @@ -288,9 +288,7 @@ ifeq ($(TARGET),framebuffer) # Valid options: internal, freetype NETSURF_FB_FONTLIB := internal - # freetype compiled in font locations - NETSURF_FB_FONTPATH := /usr/share/fonts/truetype/ttf-dejavu:/usr/share/fonts/truetype/msttcorefonts - + # Default freetype font files NETSURF_FB_FONT_SANS_SERIF := DejaVuSans.ttf NETSURF_FB_FONT_SANS_SERIF_BOLD := DejaVuSans-Bold.ttf NETSURF_FB_FONT_SANS_SERIF_ITALIC := DejaVuSans-Oblique.ttf @@ -302,18 +300,19 @@ ifeq ($(TARGET),framebuffer) NETSURF_FB_FONT_CURSIVE := Comic_Sans_MS.ttf NETSURF_FB_FONT_FANTASY := Impact.ttf - # Framebuffer frontends may have differing root paths for resources - # As such, these specify the resource path and config path. - NETSURF_FB_RESPATH_linux := $(PREFIX)/share/netsurf/ - NETSURF_FB_RESPATH_able := (tftpboot)/ - NETSURF_FB_RESPATH_dummy := ./ - NETSURF_FB_RESPATH_sdl := $(PREFIX)/share/netsurf/ - NETSURF_FB_RESPATH_x := $(PREFIX)/share/netsurf/ - NETSURF_FB_RESPATH_vnc := $(PREFIX)/share/netsurf/ - - NETSURF_FRAMEBUFFER_RESOURCES = $(NETSURF_FB_RESPATH_$(NETSURF_FB_FRONTEND)) + # Default binary install path NETSURF_FRAMEBUFFER_BIN := $(PREFIX)/bin/ + # Default resource install path + NETSURF_FRAMEBUFFER_RESOURCES := $(PREFIX)/share/netsurf/ + + # Default framebuffer search path + NETSURF_FB_RESPATH := $${HOME}/.netsurf/:$${NETSURFRES}:$(NETSURF_FRAMEBUFFER_RESOURCES):./framebuffer/res + + # freetype compiled in font serch path + NETSURF_FB_FONTPATH := /usr/share/fonts/truetype/ttf-dejavu:/usr/share/fonts/truetype/msttcorefonts + + endif # ---------------------------------------------------------------------------- diff --git a/atari/browser.c b/atari/browser.c index 0c043b3..f88610a 100755 --- a/atari/browser.c +++ b/atari/browser.c @@ -34,6 +34,7 @@ #include "desktop/gui.h" #include "desktop/netsurf.h" #include "desktop/browser.h" +#include "desktop/browser_private.h" #include "desktop/mouse.h" #include "desktop/textinput.h" #include "content/content.h" diff --git a/atari/browser_win.c b/atari/browser_win.c index 1babbad..9887083 100755 --- a/atari/browser_win.c +++ b/atari/browser_win.c @@ -34,6 +34,7 @@ #include "desktop/history_core.h" #include "desktop/netsurf.h" #include "desktop/browser.h" +#include "desktop/browser_private.h" #include "desktop/mouse.h" #include "desktop/plotters.h" #include "desktop/textinput.h" diff --git a/atari/ctxmenu.c b/atari/ctxmenu.c index 2230e00..79395ca 100644 --- a/atari/ctxmenu.c +++ b/atari/ctxmenu.c @@ -28,6 +28,7 @@ #include "desktop/gui.h" #include "desktop/netsurf.h" #include "desktop/browser.h" +#include "desktop/browser_private.h" #include "desktop/mouse.h" #include "desktop/textinput.h" #include "content/content.h" diff --git a/atari/global_evnt.c b/atari/global_evnt.c index f002f3f..1a0e8f6 100755 --- a/atari/global_evnt.c +++ b/atari/global_evnt.c @@ -28,6 +28,7 @@ #include "desktop/gui.h" #include "desktop/netsurf.h" #include "desktop/browser.h" +#include "desktop/browser_private.h" #include "desktop/mouse.h" #include "desktop/textinput.h" #include "desktop/hotlist.h" diff --git a/atari/gui.c b/atari/gui.c index 8142394..e500ad6 100755 --- a/atari/gui.c +++ b/atari/gui.c @@ -46,6 +46,7 @@ #include "desktop/selection.h" #include "desktop/textinput.h" #include "desktop/browser.h" +#include "desktop/browser_private.h" #include "desktop/mouse.h" #include "render/font.h" #include "utils/schedule.h" diff --git a/atari/toolbar.c b/atari/toolbar.c index b6dc468..3594d24 100755 --- a/atari/toolbar.c +++ b/atari/toolbar.c @@ -33,6 +33,7 @@ #include "desktop/history_core.h" #include "desktop/netsurf.h" #include "desktop/browser.h" +#include "desktop/browser_private.h" #include "desktop/mouse.h" #include "desktop/plot_style.h" #include "desktop/plotters.h" diff --git a/framebuffer/Makefile.target b/framebuffer/Makefile.target index 37341ee..974427a 100644 --- a/framebuffer/Makefile.target +++ b/framebuffer/Makefile.target @@ -21,7 +21,7 @@ NETSURF_FEATURE_GIF_CFLAGS := -DWITH_GIF CFLAGS += -Dnsframebuffer #resource path -CFLAGS += '-DNETSURF_FB_RESPATH="$(NETSURF_FB_RESPATH_$(NETSURF_FB_FRONTEND))"' +CFLAGS += '-DNETSURF_FB_RESPATH="$(NETSURF_FB_RESPATH)"' # compile time font locations CFLAGS += '-DNETSURF_FB_FONTPATH="$(NETSURF_FB_FONTPATH)"' diff --git a/framebuffer/gui.c b/framebuffer/gui.c index db0a9ef..e33df38 100644 --- a/framebuffer/gui.c +++ b/framebuffer/gui.c @@ -530,7 +530,7 @@ main(int argc, char** argv) setbuf(stderr, NULL); - respaths = fb_init_resource("${HOME}/.netsurf/:${NETSURFRES}:"NETSURF_FB_RESPATH":./framebuffer/res:"NETSURF_FB_FONTPATH); + respaths = fb_init_resource(NETSURF_FB_RESPATH":"NETSURF_FB_FONTPATH); options = filepath_find(respaths, "Choices"); messages = filepath_find(respaths, "messages"); diff --git a/javascript/jsapi/htmldocument.c b/javascript/jsapi/htmldocument.c index 1a58e4e..260f368 100644 --- a/javascript/jsapi/htmldocument.c +++ b/javascript/jsapi/htmldocument.c @@ -25,9 +25,6 @@ /* IDL http://www.whatwg.org/specs/web-apps/current-work/#the-document-object -NOTE - this interface is not from the DOM specifications but from the -html5 spec. I *think* thats right. - [OverrideBuiltins] partial interface Document { // resource metadata management -- NetSurf Browser