October 2010 - netsurf-commits - listmaster.pepperfish.net

r10871 vince - in /trunk/netsurf: Docs/BUILDING-Framebuffer Docs/USING-Framebuffer Makefile Makefile.defaults framebuffer/font_freetype.c framebuffer/options.h

by netsurf＠semichrome.net

Author: vince Date: Thu Oct 7 18:56:36 2010 New Revision: 10871 URL: http://source.netsurf-browser.org?rev=10871&view=rev Log: Clean up framebuffer compile time font selection Make framebuffer font documentation match reality Expose glyph cache size as a configuration option Modified: trunk/netsurf/Docs/BUILDING-Framebuffer trunk/netsurf/Docs/USING-Framebuffer trunk/netsurf/Makefile trunk/netsurf/Makefile.defaults trunk/netsurf/framebuffer/font_freetype.c trunk/netsurf/framebuffer/options.h Modified: trunk/netsurf/Docs/BUILDING-Framebuffer URL: http://source.netsurf-browser.org/trunk/netsurf/Docs/BUILDING-Framebuffer... ============================================================================== --- trunk/netsurf/Docs/BUILDING-Framebuffer (original) +++ trunk/netsurf/Docs/BUILDING-Framebuffer Thu Oct 7 18:56:36 2010 @@ -79,26 +79,46 @@ The font glyphs are, by default, rendered as 256 level transparency which gives excellent visual results even on small font sizes. - The default font is the Vera trutype font set. The default path they - are sourced from is /usr/share/fonts/truetype/ttf-bitstream-vera/ . + The default font is the DejaVu trutype font set. The default path they + are sourced from is /usr/share/fonts/truetype/ttf-dejavu/ . + + The compiled in default paths may be altered by setting values in + the user configuration makefile Makefile.config. These values must + be set to teh absolute path of the relevant font file including its + .ttf extension. The variables are: + + NETSURF_FB_FONT_SANS_SERIF + NETSURF_FB_FONT_SANS_SERIF_BOLD + NETSURF_FB_FONT_SANS_SERIF_ITALIC + NETSURF_FB_FONT_SANS_SERIF_ITALIC_BOLD + NETSURF_FB_FONT_SERIF + NETSURF_FB_FONT_SERIF_BOLD + NETSURF_FB_FONT_MONOSPACE + NETSURF_FB_FONT_MONOSPACE_BOLD + NETSURF_FB_FONT_CURSIVE + NETSURF_FB_FONT_FANTASY + The font selection may be changed by placing truetype font files in the resources path. The resource files will be the generic names - sans_serif.ttf, sans_serif_bold.ttf etc. The selection may also be - overridden by setting options. + sans_serif.ttf, sans_serif_bold.ttf etc. The font system is configured at runtime by several options. The fb_font_monochrome option causes the renderer to use monochrome glyph rendering which is faster to plot but slower to render and - much less visually appealing. The remaining seven options control - the files to be used for font faces. + much less visually appealing. + + The remaining seven options control the files to be used for font faces. fb_face_sans_serif - The sans serif face fb_face_sans_serif_bold - The bold sans serif face fb_face_sans_serif_italic - The italic sans serif face fb_face_sans_serif_italic_bold - The bold italic sans serif face. - fb_face_monospace - The monospaced font fb_face_serif - The serif font fb_serif_bold - The bold serif font + fb_face_monospace - The monospaced font + fb_face_monospace_bold - The bold monospaced font + fb_face_cursive - The cursive font + fb_face_fantasy - The fantasy font Old Freetype -------------- Modified: trunk/netsurf/Docs/USING-Framebuffer URL: http://source.netsurf-browser.org/trunk/netsurf/Docs/USING-Framebuffer?re... ============================================================================== --- trunk/netsurf/Docs/USING-Framebuffer (original) +++ trunk/netsurf/Docs/USING-Framebuffer Thu Oct 7 18:56:36 2010 @@ -155,27 +155,47 @@ then several configuration options are available. If the simple bitmap glyphs are used none of these options apply. + Font faces are provided for the css default styles of sans serif, + serif, monospace, cursive and fantasy. Only the sans serif + non-italic normal weight font is required to exist, If any of the + other faces are missing the sans serif font will be used instead. + + The compiled in default font file paths are specified within the + build time Makefile.config. The default faces is the truetype DejaVu + font set in the directory /usr/share/fonts/truetype/ttf-dejavu/ + The font glyphs are, by default, rendered as 256 level transparency which gives excellent visual results even on small font sizes. - The default font is the Vera truetype font set. The default path they - are sourced from is /usr/share/fonts/truetype/ttf-bitstream-vera/ . - The font selection may be changed by placing truetype font files in the resources path. The resource files will be the generic names - sans_serif.ttf, sans_serif_bold.ttf etc. The selection may also be - overridden by setting options. - - The font system is configured at run-time by several options. The - fb_font_monochrome option causes the renderer to use monochrome - glyph rendering which is faster to plot but slower to render and - much less visually appealing. The remaining seven options control - the files to be used for font faces. + sans_serif.ttf, sans_serif_bold.ttf etc. + + The font system is configured at run-time by several options: + + fb_font_monochrome + This option causes the renderer to use monochrome glyph + rendering. This method of rendering is much less visually + appealing and while faster to plot it is slower to render. + + fb_font_cachesize + This option sets the number of kilobytes of memory set aside for + caching the rendered glyphs. This caching significantly improves + the performance of using the freetype rendering system. It is set + to 2048 by default (2 Megabytes of memory) which impiracle testing + shows to be a suitable value for the seven default faces. + + The remaining options control the files to be used for font faces. The + font file name options will override both the compiled in paths and + files found in the resource path. fb_face_sans_serif - The sans serif face fb_face_sans_serif_bold - The bold sans serif face fb_face_sans_serif_italic - The italic sans serif face fb_face_sans_serif_italic_bold - The bold italic sans serif face. + fb_face_serif - The serif font + fb_face_serif_bold - The bold serif font fb_face_monospace - The monospaced font - fb_face_serif - The serif font - fb_serif_bold - The bold serif font + fb_face_monospace_bold - The bold monospaced font + fb_face_cursive - The cursive font + fb_face_fantasy - The fantasy font Modified: trunk/netsurf/Makefile URL: http://source.netsurf-browser.org/trunk/netsurf/Makefile?rev=10871&r1=108... ============================================================================== --- trunk/netsurf/Makefile (original) +++ trunk/netsurf/Makefile Thu Oct 7 18:56:36 2010 @@ -559,7 +559,22 @@ NETSURF_FEATURE_BMP_CFLAGS := -DWITH_BMP NETSURF_FEATURE_GIF_CFLAGS := -DWITH_GIF - CFLAGS += -Dnsframebuffer '-DNETSURF_FB_RESPATH="$(NETSURF_FB_RESPATH_$(NETSURF_FB_FRONTEND))"' + CFLAGS += -Dnsframebuffer + + #resource path + CFLAGS += '-DNETSURF_FB_RESPATH="$(NETSURF_FB_RESPATH_$(NETSURF_FB_FRONTEND))"' + + # compile time font locations + CFLAGS += '-DNETSURF_FB_FONT_SANS_SERIF="$(NETSURF_FB_FONT_SANS_SERIF)"' + CFLAGS += '-DNETSURF_FB_FONT_SANS_SERIF_BOLD="$(NETSURF_FB_FONT_SANS_SERIF_BOLD)"' + CFLAGS += '-DNETSURF_FB_FONT_SANS_SERIF_ITALIC="$(NETSURF_FB_FONT_SANS_SERIF_ITALIC)"' + CFLAGS += '-DNETSURF_FB_FONT_SANS_SERIF_ITALIC_BOLD="$(NETSURF_FB_FONT_SANS_SERIF_ITALIC_BOLD)"' + CFLAGS += '-DNETSURF_FB_FONT_SERIF="$(NETSURF_FB_FONT_SERIF)"' + CFLAGS += '-DNETSURF_FB_FONT_SERIF_BOLD="$(NETSURF_FB_FONT_SERIF_BOLD)"' + CFLAGS += '-DNETSURF_FB_FONT_MONOSPACE="$(NETSURF_FB_FONT_MONOSPACE)"' + CFLAGS += '-DNETSURF_FB_FONT_MONOSPACE_BOLD="$(NETSURF_FB_FONT_MONOSPACE_BOLD)"' + CFLAGS += '-DNETSURF_FB_FONT_CURSIVE="$(NETSURF_FB_FONT_CURSIVE)"' + CFLAGS += '-DNETSURF_FB_FONT_FANTASY="$(NETSURF_FB_FONT_FANTASY)"' $(eval $(call pkg_config_find_and_add,ROSPRITE,librosprite,Sprite)) $(eval $(call pkg_config_find_and_add,BMP,libnsbmp,BMP)) Modified: trunk/netsurf/Makefile.defaults URL: http://source.netsurf-browser.org/trunk/netsurf/Makefile.defaults?rev=108... ============================================================================== --- trunk/netsurf/Makefile.defaults (original) +++ trunk/netsurf/Makefile.defaults Thu Oct 7 18:56:36 2010 @@ -232,9 +232,9 @@ # Optimisation levels CFLAGS += -O2 -Wuninitialized - # Framebuffer frontend. - # Valid values are: linux, sdl, vnc, able - NETSURF_FB_FRONTEND := linux + # Framebuffer default surface provider. + # Valid values are: x, sdl, linux, vnc, able, + NETSURF_FB_FRONTEND := sdl # Use libharu to enable PDF export and GTK printing support. # Valid options: YES, NO @@ -247,6 +247,18 @@ # Library to use for font plotting # Valid options: internal, freetype NETSURF_FB_FONTLIB := internal + + # freetype compiled in font locations + NETSURF_FB_FONT_SANS_SERIF := /usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf + NETSURF_FB_FONT_SANS_SERIF_BOLD := /usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Bold.ttf + NETSURF_FB_FONT_SANS_SERIF_ITALIC := /usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Oblique.ttf + NETSURF_FB_FONT_SANS_SERIF_ITALIC_BOLD := /usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-BoldOblique.ttf + NETSURF_FB_FONT_SERIF := /usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif.ttf + NETSURF_FB_FONT_SERIF_BOLD := /usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif-Bold.ttf + NETSURF_FB_FONT_MONOSPACE := /usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono.ttf + NETSURF_FB_FONT_MONOSPACE_BOLD := /usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono-Bold.ttf + NETSURF_FB_FONT_CURSIVE := /usr/share/fonts/truetype/msttcorefonts/Comic_Sans_MS.ttf + NETSURF_FB_FONT_FANTASY := /usr/share/fonts/truetype/msttcorefonts/Impact.ttf # Framebuffer frontends may have differing root paths for resources # As such, these specify the resource path and config path. @@ -254,6 +266,7 @@ 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)) Modified: trunk/netsurf/framebuffer/font_freetype.c URL: http://source.netsurf-browser.org/trunk/netsurf/framebuffer/font_freetype... ============================================================================== --- trunk/netsurf/framebuffer/font_freetype.c (original) +++ trunk/netsurf/framebuffer/font_freetype.c Thu Oct 7 18:56:36 2010 @@ -34,7 +34,10 @@ #include "framebuffer/options.h" #include "framebuffer/findfile.h" -#define DEJAVU_PATH "/usr/share/fonts/truetype/ttf-dejavu/" +/* glyph cache minimum size */ +#define CACHE_MIN_SIZE (100 * 1024) + +#define BOLD_WEIGHT 700 static FT_Library library; static FTC_Manager ft_cmanager; @@ -50,18 +53,23 @@ int cidx; /* character map index for unicode */ } fb_faceid_t; + +enum fb_face_e { + FB_FACE_SANS_SERIF = 0, + FB_FACE_SANS_SERIF_BOLD = 1, + FB_FACE_SANS_SERIF_ITALIC = 2, + FB_FACE_SANS_SERIF_ITALIC_BOLD = 3, + FB_FACE_SERIF = 4, + FB_FACE_SERIF_BOLD = 5, + FB_FACE_MONOSPACE = 6, + FB_FACE_MONOSPACE_BOLD = 7, + FB_FACE_CURSIVE = 8, + FB_FACE_FANTASY = 9, +}; + /* defines for accesing the faces */ #define FB_FACE_DEFAULT 0 - -#define FB_FACE_SANS_SERIF 0 -#define FB_FACE_SANS_SERIF_BOLD 1 -#define FB_FACE_SANS_SERIF_ITALIC 2 -#define FB_FACE_SANS_SERIF_ITALIC_BOLD 3 -#define FB_FACE_MONOSPACE 4 -#define FB_FACE_SERIF 5 -#define FB_FACE_SERIF_BOLD 6 - -#define FB_FACE_COUNT 7 +#define FB_FACE_COUNT 10 static fb_faceid_t *fb_faces[FB_FACE_COUNT]; @@ -124,7 +132,7 @@ if (error) { LOG(("Could not find font face %s (code %d)\n", fontfile, error)); free(newf); - newf = fb_faces[FB_FACE_DEFAULT]; /* use default */ + newf = NULL; } return newf; @@ -136,6 +144,7 @@ FT_Error error; FT_ULong max_cache_size; FT_UInt max_faces = 6; + fb_faceid_t *fb_face; /* freetype library initialise */ error = FT_Init_FreeType( &library ); @@ -144,7 +153,12 @@ return false; } - max_cache_size = 2 * 1024 *1024; /* 2MB should be enough */ + /* set the Glyph cache size up */ + max_cache_size = option_fb_font_cachesize * 1024; + + if (max_cache_size < CACHE_MIN_SIZE) { + max_cache_size = CACHE_MIN_SIZE; + } /* cache manager initialise */ error = FTC_Manager_New(library, @@ -164,47 +178,122 @@ error = FTC_ImageCache_New(ft_cmanager, &ft_image_cache); - fb_faces[FB_FACE_SANS_SERIF] = NULL; - fb_faces[FB_FACE_SANS_SERIF] = - fb_new_face(option_fb_face_sans_serif, - "sans_serif.ttf", - DEJAVU_PATH"DejaVuSans.ttf"); - if (fb_faces[FB_FACE_SANS_SERIF] == NULL) { - LOG(("Could not find default font (code %d)\n", error)); - FTC_Manager_Done(ft_cmanager ); + /* need to obtain the generic font faces */ + + /* Start with the sans serif font */ + fb_face = fb_new_face(option_fb_face_sans_serif, + "sans_serif.ttf", + NETSURF_FB_FONT_SANS_SERIF); + if (fb_face == NULL) { + /* The sans serif font is the default and must be found. */ + LOG(("Could not find the default font\n")); + FTC_Manager_Done(ft_cmanager); FT_Done_FreeType(library); return false; - } - - fb_faces[FB_FACE_SANS_SERIF_BOLD] = - fb_new_face(option_fb_face_sans_serif_bold, + } else { + fb_faces[FB_FACE_SANS_SERIF] = fb_face; + } + + /* Bold sans serif face */ + fb_face = fb_new_face(option_fb_face_sans_serif_bold, "sans_serif_bold.ttf", - DEJAVU_PATH"DejaVuSans-Bold.ttf"); - - fb_faces[FB_FACE_SANS_SERIF_ITALIC] = - fb_new_face(option_fb_face_sans_serif_italic, - "sans_serif_italic.ttf", - DEJAVU_PATH"DejaVuSans-Oblique.ttf"); - - fb_faces[FB_FACE_SANS_SERIF_ITALIC_BOLD] = - fb_new_face(option_fb_face_sans_serif_italic_bold, - "sans_serif_italic_bold.ttf", - DEJAVU_PATH"DejaVuSans-BoldOblique.ttf"); - - fb_faces[FB_FACE_MONOSPACE] = - fb_new_face(option_fb_face_monospace, - "monospace.ttf", - DEJAVU_PATH"DejaVuSansMono.ttf"); - - fb_faces[FB_FACE_SERIF] = - fb_new_face(option_fb_face_serif, + NETSURF_FB_FONT_SANS_SERIF_BOLD); + if (fb_face == NULL) { + /* seperate bold face unavailabe use the normal weight version */ + fb_faces[FB_FACE_SANS_SERIF_BOLD] = fb_faces[FB_FACE_SANS_SERIF]; + } else { + fb_faces[FB_FACE_SANS_SERIF_BOLD] = fb_face; + } + + /* Italic sans serif face */ + fb_face = fb_new_face(option_fb_face_sans_serif_italic, + "sans_serif_italic.ttf", + NETSURF_FB_FONT_SANS_SERIF_ITALIC); + if (fb_face == NULL) { + /* seperate italic face unavailabe use the normal weight version */ + fb_faces[FB_FACE_SANS_SERIF_ITALIC] = fb_faces[FB_FACE_SANS_SERIF]; + } else { + fb_faces[FB_FACE_SANS_SERIF_ITALIC] = fb_face; + } + + /* Bold italic sans serif face */ + fb_face = fb_new_face(option_fb_face_sans_serif_italic_bold, + "sans_serif_italic_bold.ttf", + NETSURF_FB_FONT_SANS_SERIF_ITALIC_BOLD); + if (fb_face == NULL) { + /* seperate italic face unavailabe use the normal weight version */ + fb_faces[FB_FACE_SANS_SERIF_ITALIC_BOLD] = fb_faces[FB_FACE_SANS_SERIF]; + } else { + fb_faces[FB_FACE_SANS_SERIF_ITALIC_BOLD] = fb_face; + } + + /* serif face */ + fb_face = fb_new_face(option_fb_face_serif, "serif.ttf", - DEJAVU_PATH"DejaVuSerif.ttf"); - - fb_faces[FB_FACE_SERIF_BOLD] = - fb_new_face(option_fb_face_serif_bold, - "serif_bold.ttf", - DEJAVU_PATH"DejaVuSerif-Bold.ttf"); + NETSURF_FB_FONT_SERIF); + if (fb_face == NULL) { + /* serif face unavailabe use the default */ + fb_faces[FB_FACE_SERIF] = fb_faces[FB_FACE_SANS_SERIF]; + } else { + fb_faces[FB_FACE_SERIF] = fb_face; + } + + /* bold serif face*/ + fb_face = fb_new_face(option_fb_face_serif_bold, + "serif_bold.ttf", + NETSURF_FB_FONT_SERIF_BOLD); + if (fb_face == NULL) { + /* bold serif face unavailabe use the normal weight */ + fb_faces[FB_FACE_SERIF_BOLD] = fb_faces[FB_FACE_SERIF]; + } else { + fb_faces[FB_FACE_SERIF_BOLD] = fb_face; + } + + + /* monospace face */ + fb_face = fb_new_face(option_fb_face_monospace, + "monospace.ttf", + NETSURF_FB_FONT_MONOSPACE); + if (fb_face == NULL) { + /* serif face unavailabe use the default */ + fb_faces[FB_FACE_MONOSPACE] = fb_faces[FB_FACE_SANS_SERIF]; + } else { + fb_faces[FB_FACE_MONOSPACE] = fb_face; + } + + /* bold monospace face*/ + fb_face = fb_new_face(option_fb_face_monospace_bold, + "monospace_bold.ttf", + NETSURF_FB_FONT_MONOSPACE_BOLD); + if (fb_face == NULL) { + /* bold serif face unavailabe use the normal weight */ + fb_faces[FB_FACE_MONOSPACE_BOLD] = fb_faces[FB_FACE_MONOSPACE]; + } else { + fb_faces[FB_FACE_MONOSPACE_BOLD] = fb_face; + } + + /* cursive face */ + fb_face = fb_new_face(option_fb_face_cursive, + "cursive.ttf", + NETSURF_FB_FONT_CURSIVE); + if (fb_face == NULL) { + /* cursive face unavailabe use the default */ + fb_faces[FB_FACE_CURSIVE] = fb_faces[FB_FACE_SANS_SERIF]; + } else { + fb_faces[FB_FACE_CURSIVE] = fb_face; + } + + /* fantasy face */ + fb_face = fb_new_face(option_fb_face_fantasy, + "fantasy.ttf", + NETSURF_FB_FONT_FANTASY); + if (fb_face == NULL) { + /* fantasy face unavailabe use the default */ + fb_faces[FB_FACE_FANTASY] = fb_faces[FB_FACE_SANS_SERIF]; + } else { + fb_faces[FB_FACE_FANTASY] = fb_face; + } + /* set the default render mode */ if (option_fb_font_monochrome == true) @@ -227,37 +316,46 @@ int selected_face = FB_FACE_DEFAULT; switch (fstyle->family) { - /* + + case PLOT_FONT_FAMILY_SERIF: + if (fstyle->weight >= BOLD_WEIGHT) { + selected_face = FB_FACE_SERIF_BOLD; + } else { + selected_face = FB_FACE_SERIF; + } + break; + + case PLOT_FONT_FAMILY_MONOSPACE: + if (fstyle->weight >= BOLD_WEIGHT) { + selected_face = FB_FACE_MONOSPACE_BOLD; + } else { + selected_face = FB_FACE_MONOSPACE; + } + break; + case PLOT_FONT_FAMILY_CURSIVE: + selected_face = FB_FACE_CURSIVE; break; + case PLOT_FONT_FAMILY_FANTASY: - break; - */ - case PLOT_FONT_FAMILY_SERIF: - if (fstyle->weight >= 700) - selected_face = FB_FACE_SERIF_BOLD; - else - selected_face = FB_FACE_SERIF; - - break; - - case PLOT_FONT_FAMILY_MONOSPACE: - selected_face = FB_FACE_MONOSPACE; + selected_face = FB_FACE_FANTASY; break; case PLOT_FONT_FAMILY_SANS_SERIF: default: if ((fstyle->flags & FONTF_ITALIC) || - (fstyle->flags & FONTF_OBLIQUE)) { - if (fstyle->weight >= 700) + (fstyle->flags & FONTF_OBLIQUE)) { + if (fstyle->weight >= BOLD_WEIGHT) { selected_face = FB_FACE_SANS_SERIF_ITALIC_BOLD; - else + } else { selected_face = FB_FACE_SANS_SERIF_ITALIC; + } } else { - if (fstyle->weight >= 700) + if (fstyle->weight >= BOLD_WEIGHT) { selected_face = FB_FACE_SANS_SERIF_BOLD; - else + } else { selected_face = FB_FACE_SANS_SERIF; + } } } Modified: trunk/netsurf/framebuffer/options.h URL: http://source.netsurf-browser.org/trunk/netsurf/framebuffer/options.h?rev... ============================================================================== --- trunk/netsurf/framebuffer/options.h (original) +++ trunk/netsurf/framebuffer/options.h Thu Oct 7 18:56:36 2010 @@ -21,24 +21,42 @@ #include "desktop/options.h" +/* surface options */ + extern int option_fb_depth; extern int option_fb_refresh; extern char *option_fb_device; extern char *option_fb_input_devpath; extern char *option_fb_input_glob; + +/* toolkit options */ + extern int option_fb_furniture_size; /* toolkit furniture size */ extern int option_fb_toolbar_size; /* toolbar furniture size */ extern char *option_fb_toolbar_layout; /* toolbar layout */ extern bool option_fb_osk; /* enable on screen keyboard */ -extern bool option_fb_font_monochrome; /* render font monochrome */ +/* font options */ + +/* render font monochrome */ +extern bool option_fb_font_monochrome; +/** size of font glyph cache in kilobytes. */ +extern int option_fb_font_cachesize; + extern char *option_fb_face_sans_serif; /* default sans face */ extern char *option_fb_face_sans_serif_bold; /* bold sans face */ extern char *option_fb_face_sans_serif_italic; /* bold sans face */ extern char *option_fb_face_sans_serif_italic_bold; /* bold sans face */ -extern char *option_fb_face_monospace; /* monospace face */ + extern char *option_fb_face_serif; /* serif face */ extern char *option_fb_face_serif_bold; /* bold serif face */ + +extern char *option_fb_face_monospace; /* monospace face */ +extern char *option_fb_face_monospace_bold; /* bold monospace face */ + +extern char *option_fb_face_cursive; /* cursive face */ +extern char *option_fb_face_fantasy; /* fantasy face */ + #define EXTRA_OPTION_DEFINE \ int option_fb_depth = 32; \ @@ -51,13 +69,17 @@ char *option_fb_toolbar_layout; \ bool option_fb_osk = false; \ bool option_fb_font_monochrome = false; \ + int option_fb_font_cachesize = 2048; \ char *option_fb_face_sans_serif; \ char *option_fb_face_sans_serif_bold; \ char *option_fb_face_sans_serif_italic; \ char *option_fb_face_sans_serif_italic_bold; \ + char *option_fb_face_serif; \ + char *option_fb_face_serif_bold; \ char *option_fb_face_monospace; \ - char *option_fb_face_serif; \ - char *option_fb_face_serif_bold; + char *option_fb_face_monospace_bold; \ + char *option_fb_face_cursive; \ + char *option_fb_face_fantasy; #define EXTRA_OPTION_TABLE \ { "fb_depth", OPTION_INTEGER, &option_fb_depth }, \ @@ -70,13 +92,17 @@ { "fb_toolbar_layout", OPTION_STRING, &option_fb_toolbar_layout }, \ { "fb_osk", OPTION_BOOL, &option_fb_osk }, \ { "fb_font_monochrome", OPTION_BOOL, &option_fb_font_monochrome }, \ + { "fb_font_cachesize", OPTION_INTEGER, &option_fb_font_cachesize }, \ { "fb_face_sans_serif", OPTION_STRING, &option_fb_face_sans_serif }, \ { "fb_face_sans_serif_bold", OPTION_STRING, &option_fb_face_sans_serif_bold }, \ { "fb_face_sans_serif_italic", OPTION_STRING, &option_fb_face_sans_serif_italic }, \ { "fb_face_sans_serif_italic_bold", OPTION_STRING, &option_fb_face_sans_serif_italic_bold }, \ + { "fb_face_serif", OPTION_STRING, &option_fb_face_serif }, \ + { "fb_serif_bold", OPTION_STRING, &option_fb_face_serif_bold }, \ { "fb_face_monospace", OPTION_STRING, &option_fb_face_monospace }, \ - { "fb_face_serif", OPTION_STRING, &option_fb_face_serif }, \ - { "fb_serif_bold", OPTION_STRING, &option_fb_face_serif_bold } + { "fb_face_monospace_bold", OPTION_STRING, &option_fb_face_monospace_bold }, \ + { "fb_face_cursive", OPTION_STRING, &option_fb_face_cursive }, \ + { "fb_face_fantasy", OPTION_STRING, &option_fb_face_fantasy } #endif

13 years, 1 month

1
0
0 / 0

r10870 chris_y - in /trunk/netsurf/amiga: menu.c menu.h

by netsurf＠semichrome.net

Author: chris_y Date: Thu Oct 7 17:38:27 2010 New Revision: 10870 URL: http://source.netsurf-browser.org?rev=10870&view=rev Log: Fix menu shortcuts Modified: trunk/netsurf/amiga/menu.c trunk/netsurf/amiga/menu.h Modified: trunk/netsurf/amiga/menu.c URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/menu.c?rev=10870&r1... ============================================================================== --- trunk/netsurf/amiga/menu.c (original) +++ trunk/netsurf/amiga/menu.c Thu Oct 7 17:38:27 2010 @@ -112,7 +112,7 @@ gwin->menukey[1] = 'N'; gwin->menutype[2] = NM_ITEM; gwin->menulab[2] = ami_utf8_easy((char *)messages_get("NewTab")); - gwin->menukey[1] = 'T'; + gwin->menukey[2] = 'T'; gwin->menutype[3] = NM_ITEM; gwin->menulab[3] = NM_BARLABEL; gwin->menutype[4] = NM_ITEM; @@ -120,9 +120,9 @@ gwin->menukey[4] = 'O'; gwin->menutype[5] = NM_ITEM; gwin->menulab[5] = ami_utf8_easy((char *)messages_get("SaveAsNS")); - gwin->menukey[5] = 'S'; gwin->menutype[6] = NM_SUB; gwin->menulab[6] = ami_utf8_easy((char *)messages_get("Source")); + gwin->menukey[6] = 'S'; gwin->menutype[7] = NM_SUB; gwin->menulab[7] = ami_utf8_easy((char *)messages_get("TextNS")); gwin->menutype[8] = NM_SUB; @@ -205,8 +205,10 @@ gwin->menukey[39] = 'H'; gwin->menutype[40] = NM_ITEM; gwin->menulab[40] = ami_utf8_easy((char *)messages_get("HotlistAdd")); + gwin->menukey[40] = 'B'; gwin->menutype[41] = NM_ITEM; gwin->menulab[41] = ami_utf8_easy((char *)messages_get("HotlistShowNS")); + gwin->menukey[41] = 'H'; gwin->menutype[42] = NM_ITEM; gwin->menulab[42] = NM_BARLABEL; @@ -224,6 +226,7 @@ gwin->menulab[AMI_MENU_HOTLIST_MAX + 6] = ami_utf8_easy((char *)messages_get("ARexx")); gwin->menutype[AMI_MENU_HOTLIST_MAX + 7] = NM_ITEM; gwin->menulab[AMI_MENU_HOTLIST_MAX + 7] = ami_utf8_easy((char *)messages_get("ARexxExecute")); + gwin->menukey[AMI_MENU_HOTLIST_MAX + 7] = 'E'; gwin->menutype[AMI_MENU_HOTLIST_MAX + 8] = NM_ITEM; gwin->menulab[AMI_MENU_HOTLIST_MAX + 8] = NM_BARLABEL; Modified: trunk/netsurf/amiga/menu.h URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/menu.h?rev=10870&r1... ============================================================================== --- trunk/netsurf/amiga/menu.h (original) +++ trunk/netsurf/amiga/menu.h Thu Oct 7 17:38:27 2010 @@ -30,7 +30,7 @@ /* Maximum number of menu items - first value is number of static items * (ie. everything not intially defined as NM_IGNORE) */ -#define AMI_MENU_MAX 51 + AMI_HOTLIST_ITEMS +#define AMI_MENU_MAX 52 + AMI_HOTLIST_ITEMS /* Where the hotlist entries start */ #define AMI_MENU_HOTLIST 43

13 years, 1 month

1
0
0 / 0

r10869 chris_y - /trunk/netsurf/amiga/dist/netsurf.readme

by netsurf＠semichrome.net

Author: chris_y Date: Thu Oct 7 14:28:00 2010 New Revision: 10869 URL: http://source.netsurf-browser.org?rev=10869&view=rev Log: Less ambiguous wording; update bug reporting options Modified: trunk/netsurf/amiga/dist/netsurf.readme Modified: trunk/netsurf/amiga/dist/netsurf.readme URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/dist/netsurf.readme... ============================================================================== --- trunk/netsurf/amiga/dist/netsurf.readme (original) +++ trunk/netsurf/amiga/dist/netsurf.readme Thu Oct 7 14:28:00 2010 @@ -2,10 +2,11 @@ Uploader: chris(a)unsatisfactorysoftware.co.uk (Chris Young) Author: NetSurf contributors (OS4 port by Chris Young) Type: comm/www -Version: 3.0 development (SVN 9560) +Version: 3.0 development (SVN 10866) Architecture: ppc-amigaos >= 4.0.0 -MANUAL INSTALL ONLY - INTENTIONALLY NOT AVAILABLE VIA AMIUPDATE +Install manually with Installer script only - +INTENTIONALLY NOT AVAILABLE VIA AMIUPDATE This is a preview release of NetSurf 3.0 for AmigaOS 4. It is beta software, which means it is unstable and missing @@ -15,10 +16,7 @@ stable version, visit http://www.netsurf-browser.org Please report bugs to chris(a)unsatisfactorysoftware.co.uk, -on the Amigans.net forums or in the bug tracker at -http://www.unsatisfactorysoftware.co.uk/bugs (the bug tracker -does not send email notifications, so please also use one of -the other methods or it might not be picked up quickly) +on the Amigans.net forums or on the NetSurf mailing list. See http://www.netsurf-browser.org for more information about NetSurf.

13 years, 1 month

1
0
0 / 0

r10868 vince - /trunk/netsurf/desktop/cookies.c

by netsurf＠semichrome.net

Author: vince Date: Wed Oct 6 16:46:06 2010 New Revision: 10868 URL: http://source.netsurf-browser.org?rev=10868&view=rev Log: If the cookies tree has not been initialised do not allow operations to be scheduled upon it. Modified: trunk/netsurf/desktop/cookies.c Modified: trunk/netsurf/desktop/cookies.c URL: http://source.netsurf-browser.org/trunk/netsurf/desktop/cookies.c?rev=108... ============================================================================== --- trunk/netsurf/desktop/cookies.c (original) +++ trunk/netsurf/desktop/cookies.c Wed Oct 6 16:46:06 2010 @@ -69,6 +69,8 @@ { struct node *search; struct node_element *element; + + assert(node !=NULL); for (search = tree_node_get_child(node); search; search = tree_node_get_next(search)) { @@ -408,7 +410,8 @@ assert(data != NULL); assert(user_delete == false); - schedule(100, cookies_schedule_callback, (void *)data); + if (cookies_tree_root != NULL) + schedule(100, cookies_schedule_callback, (void *)data); return true; } @@ -419,7 +422,8 @@ { assert(data != NULL); - schedule_remove(cookies_schedule_callback, (void *)data); + if (cookies_tree_root != NULL) + schedule_remove(cookies_schedule_callback, (void *)data); }

13 years, 1 month

1
0
0 / 0

r10867 chris_y - /trunk/netsurf/amiga/pkg/makepackage

by netsurf＠semichrome.net

Author: chris_y Date: Wed Oct 6 12:55:46 2010 New Revision: 10867 URL: http://source.netsurf-browser.org?rev=10867&view=rev Log: Copy icons to theme dir Modified: trunk/netsurf/amiga/pkg/makepackage Modified: trunk/netsurf/amiga/pkg/makepackage URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/pkg/makepackage?rev... ============================================================================== --- trunk/netsurf/amiga/pkg/makepackage (original) +++ trunk/netsurf/amiga/pkg/makepackage Wed Oct 6 12:55:46 2010 @@ -6,7 +6,8 @@ list resources/Themes/~(.svn) LFORMAT="copy %f%n/~(.svn) ram:netsurf/resources/Themes/%n/" dirs >>t:nslinks execute t:nslinks delete t:nslinks -delete ram:netsurf/resources/hotlist +copy !NetSurf/Resources/Icons/#?.png ram:netsurf/resources/themes/default +delete ram:netsurf/resources/#?hotlist#? delete ram:netsurf/resources/cookies delete ram:netsurf/resources/urls delete ram:netsurf/resources/options

13 years, 1 month

1
0
0 / 0

r10866 jmb - /trunk/netsurf/framebuffer/gui.c

by netsurf＠semichrome.net

Author: jmb Date: Tue Oct 5 14:24:54 2010 New Revision: 10866 URL: http://source.netsurf-browser.org?rev=10866&view=rev Log: Squash warnings Modified: trunk/netsurf/framebuffer/gui.c Modified: trunk/netsurf/framebuffer/gui.c URL: http://source.netsurf-browser.org/trunk/netsurf/framebuffer/gui.c?rev=108... ============================================================================== --- trunk/netsurf/framebuffer/gui.c (original) +++ trunk/netsurf/framebuffer/gui.c Tue Oct 5 14:24:54 2010 @@ -940,7 +940,7 @@ fbtk_widget_t *widget; int xpos; /* The position of the next widget. */ - int xlhs; /* extent of the left hand side widgets */ + int xlhs = 0; /* extent of the left hand side widgets */ int xdir = 1; /* the direction of movement + or - 1 */ const char *itmtype; /* type of the next item */ @@ -1117,13 +1117,16 @@ break; default: + widget = NULL; xdir = 0; LOG(("Unknown element %c in toolbar layout", *itmtype)); break; } - xpos += (xdir * (fbtk_get_width(widget) + padding)); + if (widget != NULL) { + xpos += (xdir * (fbtk_get_width(widget) + padding)); + } LOG(("xpos is %d",xpos));

13 years, 1 month

1
0
0 / 0

r10865 jmb - in /trunk/netsurf: !NetSurf/Resources/Icons/ !NetSurf/Resources/de/ !NetSurf/Resources/en/ !NetSurf/Resources/fr/ !NetSurf/Resources/it/ !NetSurf/Resources/nl/ ./ amiga/ amiga/resources/Themes/AISS/ amiga/resources/Themes/Default/ beos/ content/ desktop/ framebuffer/ gtk/ gtk/res/ riscos/ riscos/configure/ utils/ windows/

by netsurf＠semichrome.net

Author: jmb Date: Tue Oct 5 14:14:46 2010 New Revision: 10865 URL: http://source.netsurf-browser.org?rev=10865&view=rev Log: Merge treeview-redux to trunk Added: trunk/netsurf/!NetSurf/Resources/Icons/ - copied from r10864, branches/jmb/treeview-redux/!NetSurf/Resources/Icons/ trunk/netsurf/amiga/resources/Themes/Default/content.png - copied unchanged from r10864, branches/jmb/treeview-redux/amiga/resources/Themes/Default/content.png trunk/netsurf/amiga/resources/Themes/Default/directory.png - copied unchanged from r10864, branches/jmb/treeview-redux/amiga/resources/Themes/Default/directory.png trunk/netsurf/amiga/sslcert.h - copied unchanged from r10864, branches/jmb/treeview-redux/amiga/sslcert.h trunk/netsurf/desktop/cookies.c - copied unchanged from r10864, branches/jmb/treeview-redux/desktop/cookies.c trunk/netsurf/desktop/history_global_core.c - copied unchanged from r10864, branches/jmb/treeview-redux/desktop/history_global_core.c trunk/netsurf/desktop/history_global_core.h - copied unchanged from r10864, branches/jmb/treeview-redux/desktop/history_global_core.h trunk/netsurf/desktop/hotlist.c - copied unchanged from r10864, branches/jmb/treeview-redux/desktop/hotlist.c trunk/netsurf/desktop/hotlist.h - copied unchanged from r10864, branches/jmb/treeview-redux/desktop/hotlist.h trunk/netsurf/desktop/sslcert.c - copied unchanged from r10864, branches/jmb/treeview-redux/desktop/sslcert.c trunk/netsurf/desktop/sslcert.h - copied unchanged from r10864, branches/jmb/treeview-redux/desktop/sslcert.h trunk/netsurf/desktop/tree_url_node.c - copied unchanged from r10864, branches/jmb/treeview-redux/desktop/tree_url_node.c trunk/netsurf/desktop/tree_url_node.h - copied unchanged from r10864, branches/jmb/treeview-redux/desktop/tree_url_node.h trunk/netsurf/gtk/gtk_cookies.c - copied unchanged from r10864, branches/jmb/treeview-redux/gtk/gtk_cookies.c trunk/netsurf/gtk/gtk_cookies.h - copied unchanged from r10864, branches/jmb/treeview-redux/gtk/gtk_cookies.h trunk/netsurf/gtk/gtk_hotlist.c - copied unchanged from r10864, branches/jmb/treeview-redux/gtk/gtk_hotlist.c trunk/netsurf/gtk/gtk_hotlist.h - copied unchanged from r10864, branches/jmb/treeview-redux/gtk/gtk_hotlist.h trunk/netsurf/gtk/gtk_treeview.h - copied unchanged from r10864, branches/jmb/treeview-redux/gtk/gtk_treeview.h trunk/netsurf/gtk/res/cookies.glade - copied unchanged from r10864, branches/jmb/treeview-redux/gtk/res/cookies.glade trunk/netsurf/gtk/res/hotlist.glade - copied unchanged from r10864, branches/jmb/treeview-redux/gtk/res/hotlist.glade trunk/netsurf/gtk/res/icons - copied unchanged from r10864, branches/jmb/treeview-redux/gtk/res/icons trunk/netsurf/riscos/hotlist.h - copied unchanged from r10864, branches/jmb/treeview-redux/riscos/hotlist.h trunk/netsurf/riscos/sslcert.h - copied unchanged from r10864, branches/jmb/treeview-redux/riscos/sslcert.h trunk/netsurf/riscos/url_suggest.c - copied unchanged from r10864, branches/jmb/treeview-redux/riscos/url_suggest.c trunk/netsurf/riscos/url_suggest.h - copied unchanged from r10864, branches/jmb/treeview-redux/riscos/url_suggest.h Removed: trunk/netsurf/beos/beos_history.cpp trunk/netsurf/beos/beos_history.h trunk/netsurf/framebuffer/history.c trunk/netsurf/framebuffer/hotlist.c trunk/netsurf/windows/history.c trunk/netsurf/windows/hotlist.c Modified: trunk/netsurf/!NetSurf/Resources/de/Messages trunk/netsurf/!NetSurf/Resources/en/Messages trunk/netsurf/!NetSurf/Resources/fr/Messages trunk/netsurf/!NetSurf/Resources/it/Messages trunk/netsurf/!NetSurf/Resources/nl/Messages trunk/netsurf/Makefile.sources trunk/netsurf/amiga/cookies.c trunk/netsurf/amiga/cookies.h trunk/netsurf/amiga/gui.c trunk/netsurf/amiga/gui.h trunk/netsurf/amiga/history.c trunk/netsurf/amiga/history.h trunk/netsurf/amiga/hotlist.c trunk/netsurf/amiga/hotlist.h trunk/netsurf/amiga/menu.c trunk/netsurf/amiga/menu.h trunk/netsurf/amiga/object.c trunk/netsurf/amiga/object.h trunk/netsurf/amiga/options.h trunk/netsurf/amiga/plotters.c trunk/netsurf/amiga/resources/Themes/AISS/Theme trunk/netsurf/amiga/resources/Themes/Default/Theme trunk/netsurf/amiga/sslcert.c trunk/netsurf/amiga/theme.c trunk/netsurf/amiga/theme.h trunk/netsurf/amiga/tree.c trunk/netsurf/amiga/tree.h trunk/netsurf/beos/beos_bitmap.cpp trunk/netsurf/beos/beos_gui.cpp trunk/netsurf/beos/beos_scaffolding.cpp trunk/netsurf/beos/beos_treeview.cpp trunk/netsurf/content/urldb.c trunk/netsurf/content/urldb.h trunk/netsurf/desktop/browser.c trunk/netsurf/desktop/cookies.h trunk/netsurf/desktop/options.c trunk/netsurf/desktop/options.h trunk/netsurf/desktop/tree.c trunk/netsurf/desktop/tree.h trunk/netsurf/framebuffer/misc.c trunk/netsurf/framebuffer/tree.c trunk/netsurf/gtk/gtk_gui.c trunk/netsurf/gtk/gtk_history.c trunk/netsurf/gtk/gtk_history.h trunk/netsurf/gtk/gtk_menu.c trunk/netsurf/gtk/gtk_menu.h trunk/netsurf/gtk/gtk_plotters.c trunk/netsurf/gtk/gtk_scaffolding.c trunk/netsurf/gtk/gtk_scaffolding.h trunk/netsurf/gtk/gtk_theme.c trunk/netsurf/gtk/gtk_toolbar.c trunk/netsurf/gtk/gtk_toolbar.h trunk/netsurf/gtk/gtk_treeview.c trunk/netsurf/gtk/gtk_window.c trunk/netsurf/gtk/options.h trunk/netsurf/gtk/res/history.glade trunk/netsurf/gtk/res/ssl.glade trunk/netsurf/riscos/configure/con_home.c trunk/netsurf/riscos/cookies.c trunk/netsurf/riscos/cookies.h trunk/netsurf/riscos/dialog.c trunk/netsurf/riscos/global_history.c trunk/netsurf/riscos/global_history.h trunk/netsurf/riscos/gui.c trunk/netsurf/riscos/gui.h trunk/netsurf/riscos/help.c trunk/netsurf/riscos/hotlist.c trunk/netsurf/riscos/menus.c trunk/netsurf/riscos/menus.h trunk/netsurf/riscos/save.c trunk/netsurf/riscos/sslcert.c trunk/netsurf/riscos/textselection.c trunk/netsurf/riscos/theme.c trunk/netsurf/riscos/treeview.c trunk/netsurf/riscos/treeview.h trunk/netsurf/riscos/url_complete.c trunk/netsurf/riscos/wimp_event.c trunk/netsurf/riscos/wimp_event.h trunk/netsurf/riscos/window.c trunk/netsurf/utils/messages.c trunk/netsurf/utils/messages.h trunk/netsurf/windows/tree.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/netsurf/!NetSurf/Resources/de/Messages URL: http://source.netsurf-browser.org/trunk/netsurf/%21NetSurf/Resources/de/M... Modified: trunk/netsurf/!NetSurf/Resources/en/Messages URL: http://source.netsurf-browser.org/trunk/netsurf/%21NetSurf/Resources/en/M... Modified: trunk/netsurf/!NetSurf/Resources/fr/Messages URL: http://source.netsurf-browser.org/trunk/netsurf/%21NetSurf/Resources/fr/M... Modified: trunk/netsurf/!NetSurf/Resources/it/Messages URL: http://source.netsurf-browser.org/trunk/netsurf/%21NetSurf/Resources/it/M... Modified: trunk/netsurf/!NetSurf/Resources/nl/Messages URL: http://source.netsurf-browser.org/trunk/netsurf/%21NetSurf/Resources/nl/M... Modified: trunk/netsurf/Makefile.sources URL: http://source.netsurf-browser.org/trunk/netsurf/Makefile.sources?rev=1086... Modified: trunk/netsurf/amiga/cookies.c URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/cookies.c?rev=10865... Modified: trunk/netsurf/amiga/cookies.h URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/cookies.h?rev=10865... Modified: trunk/netsurf/amiga/gui.c URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/gui.c?rev=10865&r1=... Modified: trunk/netsurf/amiga/gui.h URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/gui.h?rev=10865&r1=... Modified: trunk/netsurf/amiga/history.c URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/history.c?rev=10865... Modified: trunk/netsurf/amiga/history.h URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/history.h?rev=10865... Modified: trunk/netsurf/amiga/hotlist.c URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/hotlist.c?rev=10865... Modified: trunk/netsurf/amiga/hotlist.h URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/hotlist.h?rev=10865... Modified: trunk/netsurf/amiga/menu.c URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/menu.c?rev=10865&r1... Modified: trunk/netsurf/amiga/menu.h URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/menu.h?rev=10865&r1... Modified: trunk/netsurf/amiga/object.c URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/object.c?rev=10865&... Modified: trunk/netsurf/amiga/object.h URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/object.h?rev=10865&... Modified: trunk/netsurf/amiga/options.h URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/options.h?rev=10865... Modified: trunk/netsurf/amiga/plotters.c URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/plotters.c?rev=1086... Modified: trunk/netsurf/amiga/resources/Themes/AISS/Theme URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/resources/Themes/AI... Modified: trunk/netsurf/amiga/resources/Themes/Default/Theme URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/resources/Themes/De... Modified: trunk/netsurf/amiga/sslcert.c URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/sslcert.c?rev=10865... Modified: trunk/netsurf/amiga/theme.c URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/theme.c?rev=10865&r... Modified: trunk/netsurf/amiga/theme.h URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/theme.h?rev=10865&r... Modified: trunk/netsurf/amiga/tree.c URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/tree.c?rev=10865&r1... Modified: trunk/netsurf/amiga/tree.h URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/tree.h?rev=10865&r1... Modified: trunk/netsurf/beos/beos_bitmap.cpp URL: http://source.netsurf-browser.org/trunk/netsurf/beos/beos_bitmap.cpp?rev=... Modified: trunk/netsurf/beos/beos_gui.cpp URL: http://source.netsurf-browser.org/trunk/netsurf/beos/beos_gui.cpp?rev=108... Removed: trunk/netsurf/beos/beos_history.cpp URL: http://source.netsurf-browser.org/trunk/netsurf/beos/beos_history.cpp?rev... Removed: trunk/netsurf/beos/beos_history.h URL: http://source.netsurf-browser.org/trunk/netsurf/beos/beos_history.h?rev=1... Modified: trunk/netsurf/beos/beos_scaffolding.cpp URL: http://source.netsurf-browser.org/trunk/netsurf/beos/beos_scaffolding.cpp... Modified: trunk/netsurf/beos/beos_treeview.cpp URL: http://source.netsurf-browser.org/trunk/netsurf/beos/beos_treeview.cpp?re... Modified: trunk/netsurf/content/urldb.c URL: http://source.netsurf-browser.org/trunk/netsurf/content/urldb.c?rev=10865... Modified: trunk/netsurf/content/urldb.h URL: http://source.netsurf-browser.org/trunk/netsurf/content/urldb.h?rev=10865... Modified: trunk/netsurf/desktop/browser.c URL: http://source.netsurf-browser.org/trunk/netsurf/desktop/browser.c?rev=108... Modified: trunk/netsurf/desktop/cookies.h URL: http://source.netsurf-browser.org/trunk/netsurf/desktop/cookies.h?rev=108... Modified: trunk/netsurf/desktop/options.c URL: http://source.netsurf-browser.org/trunk/netsurf/desktop/options.c?rev=108... Modified: trunk/netsurf/desktop/options.h URL: http://source.netsurf-browser.org/trunk/netsurf/desktop/options.h?rev=108... Modified: trunk/netsurf/desktop/tree.c URL: http://source.netsurf-browser.org/trunk/netsurf/desktop/tree.c?rev=10865&... Modified: trunk/netsurf/desktop/tree.h URL: http://source.netsurf-browser.org/trunk/netsurf/desktop/tree.h?rev=10865&... Removed: trunk/netsurf/framebuffer/history.c URL: http://source.netsurf-browser.org/trunk/netsurf/framebuffer/history.c?rev... Removed: trunk/netsurf/framebuffer/hotlist.c URL: http://source.netsurf-browser.org/trunk/netsurf/framebuffer/hotlist.c?rev... Modified: trunk/netsurf/framebuffer/misc.c URL: http://source.netsurf-browser.org/trunk/netsurf/framebuffer/misc.c?rev=10... Modified: trunk/netsurf/framebuffer/tree.c URL: http://source.netsurf-browser.org/trunk/netsurf/framebuffer/tree.c?rev=10... Modified: trunk/netsurf/gtk/gtk_gui.c URL: http://source.netsurf-browser.org/trunk/netsurf/gtk/gtk_gui.c?rev=10865&r... Modified: trunk/netsurf/gtk/gtk_history.c URL: http://source.netsurf-browser.org/trunk/netsurf/gtk/gtk_history.c?rev=108... Modified: trunk/netsurf/gtk/gtk_history.h URL: http://source.netsurf-browser.org/trunk/netsurf/gtk/gtk_history.h?rev=108... Modified: trunk/netsurf/gtk/gtk_menu.c URL: http://source.netsurf-browser.org/trunk/netsurf/gtk/gtk_menu.c?rev=10865&... Modified: trunk/netsurf/gtk/gtk_menu.h URL: http://source.netsurf-browser.org/trunk/netsurf/gtk/gtk_menu.h?rev=10865&... Modified: trunk/netsurf/gtk/gtk_plotters.c URL: http://source.netsurf-browser.org/trunk/netsurf/gtk/gtk_plotters.c?rev=10... Modified: trunk/netsurf/gtk/gtk_scaffolding.c URL: http://source.netsurf-browser.org/trunk/netsurf/gtk/gtk_scaffolding.c?rev... Modified: trunk/netsurf/gtk/gtk_scaffolding.h URL: http://source.netsurf-browser.org/trunk/netsurf/gtk/gtk_scaffolding.h?rev... Modified: trunk/netsurf/gtk/gtk_theme.c URL: http://source.netsurf-browser.org/trunk/netsurf/gtk/gtk_theme.c?rev=10865... Modified: trunk/netsurf/gtk/gtk_toolbar.c URL: http://source.netsurf-browser.org/trunk/netsurf/gtk/gtk_toolbar.c?rev=108... Modified: trunk/netsurf/gtk/gtk_toolbar.h URL: http://source.netsurf-browser.org/trunk/netsurf/gtk/gtk_toolbar.h?rev=108... Modified: trunk/netsurf/gtk/gtk_treeview.c URL: http://source.netsurf-browser.org/trunk/netsurf/gtk/gtk_treeview.c?rev=10... Modified: trunk/netsurf/gtk/gtk_window.c URL: http://source.netsurf-browser.org/trunk/netsurf/gtk/gtk_window.c?rev=1086... Modified: trunk/netsurf/gtk/options.h URL: http://source.netsurf-browser.org/trunk/netsurf/gtk/options.h?rev=10865&r... Modified: trunk/netsurf/gtk/res/history.glade URL: http://source.netsurf-browser.org/trunk/netsurf/gtk/res/history.glade?rev... Modified: trunk/netsurf/gtk/res/ssl.glade URL: http://source.netsurf-browser.org/trunk/netsurf/gtk/res/ssl.glade?rev=108... Modified: trunk/netsurf/riscos/configure/con_home.c URL: http://source.netsurf-browser.org/trunk/netsurf/riscos/configure/con_home... Modified: trunk/netsurf/riscos/cookies.c URL: http://source.netsurf-browser.org/trunk/netsurf/riscos/cookies.c?rev=1086... Modified: trunk/netsurf/riscos/cookies.h URL: http://source.netsurf-browser.org/trunk/netsurf/riscos/cookies.h?rev=1086... Modified: trunk/netsurf/riscos/dialog.c URL: http://source.netsurf-browser.org/trunk/netsurf/riscos/dialog.c?rev=10865... Modified: trunk/netsurf/riscos/global_history.c URL: http://source.netsurf-browser.org/trunk/netsurf/riscos/global_history.c?r... Modified: trunk/netsurf/riscos/global_history.h URL: http://source.netsurf-browser.org/trunk/netsurf/riscos/global_history.h?r... Modified: trunk/netsurf/riscos/gui.c URL: http://source.netsurf-browser.org/trunk/netsurf/riscos/gui.c?rev=10865&r1... Modified: trunk/netsurf/riscos/gui.h URL: http://source.netsurf-browser.org/trunk/netsurf/riscos/gui.h?rev=10865&r1... Modified: trunk/netsurf/riscos/help.c URL: http://source.netsurf-browser.org/trunk/netsurf/riscos/help.c?rev=10865&r... Modified: trunk/netsurf/riscos/hotlist.c URL: http://source.netsurf-browser.org/trunk/netsurf/riscos/hotlist.c?rev=1086... Modified: trunk/netsurf/riscos/menus.c URL: http://source.netsurf-browser.org/trunk/netsurf/riscos/menus.c?rev=10865&... Modified: trunk/netsurf/riscos/menus.h URL: http://source.netsurf-browser.org/trunk/netsurf/riscos/menus.h?rev=10865&... Modified: trunk/netsurf/riscos/save.c URL: http://source.netsurf-browser.org/trunk/netsurf/riscos/save.c?rev=10865&r... Modified: trunk/netsurf/riscos/sslcert.c URL: http://source.netsurf-browser.org/trunk/netsurf/riscos/sslcert.c?rev=1086... Modified: trunk/netsurf/riscos/textselection.c URL: http://source.netsurf-browser.org/trunk/netsurf/riscos/textselection.c?re... Modified: trunk/netsurf/riscos/theme.c URL: http://source.netsurf-browser.org/trunk/netsurf/riscos/theme.c?rev=10865&... Modified: trunk/netsurf/riscos/treeview.c URL: http://source.netsurf-browser.org/trunk/netsurf/riscos/treeview.c?rev=108... Modified: trunk/netsurf/riscos/treeview.h URL: http://source.netsurf-browser.org/trunk/netsurf/riscos/treeview.h?rev=108... Modified: trunk/netsurf/riscos/url_complete.c URL: http://source.netsurf-browser.org/trunk/netsurf/riscos/url_complete.c?rev... Modified: trunk/netsurf/riscos/wimp_event.c URL: http://source.netsurf-browser.org/trunk/netsurf/riscos/wimp_event.c?rev=1... Modified: trunk/netsurf/riscos/wimp_event.h URL: http://source.netsurf-browser.org/trunk/netsurf/riscos/wimp_event.h?rev=1... Modified: trunk/netsurf/riscos/window.c URL: http://source.netsurf-browser.org/trunk/netsurf/riscos/window.c?rev=10865... Modified: trunk/netsurf/utils/messages.c URL: http://source.netsurf-browser.org/trunk/netsurf/utils/messages.c?rev=1086... Modified: trunk/netsurf/utils/messages.h URL: http://source.netsurf-browser.org/trunk/netsurf/utils/messages.h?rev=1086... Removed: trunk/netsurf/windows/history.c URL: http://source.netsurf-browser.org/trunk/netsurf/windows/history.c?rev=108... Removed: trunk/netsurf/windows/hotlist.c URL: http://source.netsurf-browser.org/trunk/netsurf/windows/hotlist.c?rev=108... Modified: trunk/netsurf/windows/tree.c URL: http://source.netsurf-browser.org/trunk/netsurf/windows/tree.c?rev=10865&...

13 years, 1 month

1
0
0 / 0

r10864 rjek - /trunk/netsurf/utils/log.h

by netsurf＠semichrome.net

Author: rjek Date: Mon Oct 4 14:58:10 2010 New Revision: 10864 URL: http://source.netsurf-browser.org?rev=10864&view=rev Log: Add seconds/microseconds wallclock time to log output, move header includes to inside guard. Modified: trunk/netsurf/utils/log.h Modified: trunk/netsurf/utils/log.h URL: http://source.netsurf-browser.org/trunk/netsurf/utils/log.h?rev=10864&r1=... ============================================================================== --- trunk/netsurf/utils/log.h (original) +++ trunk/netsurf/utils/log.h Mon Oct 4 14:58:10 2010 @@ -17,21 +17,34 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include <stdio.h> -#include "desktop/netsurf.h" - #ifndef _NETSURF_LOG_H_ #define _NETSURF_LOG_H_ + +#include <stdio.h> +#include <sys/time.h> +#include "desktop/netsurf.h" #ifdef NDEBUG # define LOG(x) ((void) 0) #else + +static inline const char *nslog_gettime(void) +{ + static char buff[32]; + static struct timeval tv; + + gettimeofday(&tv, NULL); + snprintf(buff, sizeof(buff),"(%ld.%ld)", tv.tv_sec, tv.tv_usec); + return buff; +} + # ifdef __GNUC__ -# define LOG(x) do { if (verbose_log) (printf(__FILE__ " %s %i: ", __PRETTY_FUNCTION__, __LINE__), printf x, fputc('\n', stdout)); } while (0) +# define LOG(x) do { if (verbose_log) (printf("%s " __FILE__ " %s %i: ", nslog_gettime(), __PRETTY_FUNCTION__, __LINE__), printf x, fputc('\n', stdout)); } while (0) + # elif defined(__CC_NORCROFT) -# define LOG(x) do { if (verbose_log) (printf(__FILE__ " %s %i: ", __func__, __LINE__), printf x, fputc('\n', stdout)); } while (0) +# define LOG(x) do { if (verbose_log) (printf("%s "__FILE__ " %s %i: ", nslog_gettime(), __func__, __LINE__), printf x, fputc('\n', stdout)); } while (0) # else -# define LOG(x) do { if (verbose_log) (printf(__FILE__ " %i: ", __LINE__), printf x, fputc('\n', stdout)); } while (0) +# define LOG(x) do { if (verbose_log) (printf("%s" __FILE__ " %i: ", nslog_gettime(), __LINE__), printf x, fputc('\n', stdout)); } while (0) # endif #endif

13 years, 1 month

1
0
0 / 0

r10863 jmb - /trunk/librosprite/librosprite.c

by netsurf＠semichrome.net

Author: jmb Date: Mon Oct 4 14:35:58 2010 New Revision: 10863 URL: http://source.netsurf-browser.org?rev=10863&view=rev Log: C89 compatibility (credit: Scott McCreary) Modified: trunk/librosprite/librosprite.c Modified: trunk/librosprite/librosprite.c URL: http://source.netsurf-browser.org/trunk/librosprite/librosprite.c?rev=108... ============================================================================== --- trunk/librosprite/librosprite.c (original) +++ trunk/librosprite/librosprite.c Mon Oct 4 14:35:58 2010 @@ -233,11 +233,14 @@ rosprite_error rosprite_load(reader reader, void* ctx, struct rosprite_area** result) { + uint32_t firstSpriteOffset, firstFreeWordOffset; + int bytes_read; + uint32_t i; + struct rosprite_area* sprite_area = malloc(sizeof(struct rosprite_area)); ERRCHK(rosprite_read_word(reader, ctx, &(sprite_area->sprite_count))); - uint32_t firstSpriteOffset, firstFreeWordOffset; ERRCHK(rosprite_read_word(reader, ctx, &firstSpriteOffset)); ERRCHK(rosprite_read_word(reader, ctx, &firstFreeWordOffset)); /* TODO: use this for some sanity checking? */ sprite_area->extension_size = 16 - firstSpriteOffset; @@ -245,14 +248,14 @@ sprite_area->extension_words = NULL; if (sprite_area->extension_size > 0) { sprite_area->extension_words = malloc(sprite_area->extension_size); - int bytes_read = reader(sprite_area->extension_words, (size_t) (sprite_area->extension_size), ctx); + bytes_read = reader(sprite_area->extension_words, (size_t) (sprite_area->extension_size), ctx); if (bytes_read < (signed long) sprite_area->extension_size) { return ROSPRITE_EOF; } } sprite_area->sprites = malloc(sizeof(struct rosprite*) * sprite_area->sprite_count); /* allocate array of pointers */ - for (uint32_t i = 0; i < sprite_area->sprite_count; i++) { + for (i = 0; i < sprite_area->sprite_count; i++) { struct rosprite* sprite; ERRCHK(rosprite_load_sprite(reader, ctx, &sprite)); sprite_area->sprites[i] = sprite; @@ -265,7 +268,8 @@ void rosprite_destroy_sprite_area(struct rosprite_area* sprite_area) { - for (uint32_t i = 0; i < sprite_area->sprite_count; i++) { + uint32_t i; + for (i = 0; i < sprite_area->sprite_count; i++) { struct rosprite* sprite = sprite_area->sprites[i]; if (sprite->has_palette) free(sprite->palette); free(sprite->image); @@ -279,15 +283,18 @@ rosprite_error rosprite_load_palette(reader reader, void* ctx, struct rosprite_palette** result) { + uint32_t c; + uint8_t b[6]; + unsigned int bytesRead; + /* TODO: currently assume palette has linear entries (2nd byte in is 00, 01, 02 etc) */ struct rosprite_palette* palette = malloc(sizeof(struct rosprite_palette)); palette->palette = malloc(sizeof(uint32_t) * 256); /* allocate 256 whether we need them all or not */ - uint32_t c = 0; - uint8_t b[6]; - - unsigned int bytesRead = reader(b, 6, ctx); + c = 0; + + bytesRead = reader(b, 6, ctx); assert(bytesRead % 6 == 0); while (bytesRead == 6) { assert(b[0] == 19); /* VDU 19 */ @@ -360,13 +367,13 @@ int rosprite_mem_reader(uint8_t* buf, size_t count, void* ctx) { + size_t copy_size; struct rosprite_mem_context* memctx = (struct rosprite_mem_context*) ctx; if (memctx->offset + count > memctx->size) { return -1; } // if we're asked for more memory than the block contains, only copy as much as we can - size_t copy_size; if ((memctx->offset + count) > memctx->size) { copy_size = memctx->size - memctx->offset; } else { @@ -385,10 +392,16 @@ rosprite_error rosprite_load_sprite(reader reader, void* ctx, struct rosprite** result) { uint32_t nextSpriteOffset; - ERRCHK(rosprite_read_word(reader, ctx, &nextSpriteOffset)); - + uint32_t imageOffset; + uint32_t maskOffset, spriteModeWord; + uint32_t paletteEntries; + uint8_t* image; + uint8_t* mask = NULL; + struct rosprite* sprite = malloc(sizeof(struct rosprite)); struct rosprite_header* header = malloc(sizeof(struct rosprite_header)); + + ERRCHK(rosprite_read_word(reader, ctx, &nextSpriteOffset)); reader(sprite->name, 12, ctx); sprite->name[12] = '\0'; @@ -400,11 +413,9 @@ ERRCHK(rosprite_read_word(reader, ctx, &(header->first_used_bit))); /* old format only (spriteType = 0) */ ERRCHK(rosprite_read_word(reader, ctx, &(header->last_used_bit))); - uint32_t imageOffset; ERRCHK(rosprite_read_word(reader, ctx, &imageOffset)); assert(imageOffset >= 44); /* should never be smaller than the size of the header) */ - uint32_t maskOffset, spriteModeWord; ERRCHK(rosprite_read_word(reader, ctx, &maskOffset)); ERRCHK(rosprite_read_word(reader, ctx, &spriteModeWord)); @@ -431,31 +442,30 @@ } if (sprite->has_palette) { + uint32_t j, word1, word2, entry; assert(sprite->palettesize % 8 == 0); sprite->palette = malloc(sizeof(uint32_t) * sprite->palettesize); - uint32_t paletteEntries = sprite->palettesize / 8; + paletteEntries = sprite->palettesize / 8; /* Each palette entry is two words big * The second word is a duplicate of the first * I think this is in case you ever wanted flashing colours * PRM1-730 */ - for (uint32_t j = 0; j < paletteEntries; j++) { - uint32_t word1, word2; + for (j = 0; j < paletteEntries; j++) { ERRCHK(rosprite_read_word(reader, ctx, &word1)); ERRCHK(rosprite_read_word(reader, ctx, &word2)); assert(word1 == word2); /* if they aren't equal, flashing colours are desired, which we don't support */ /* swap rr and bb parts -- PRM1-731 */ - uint32_t entry = ((word1 & 0xff000000) >> 16) | (word1 & 0x00ff0000) | ((word1 & 0x0000ff00) << 16) | 0xff; + entry = ((word1 & 0xff000000) >> 16) | (word1 & 0x00ff0000) | ((word1 & 0x0000ff00) << 16) | 0xff; sprite->palette[j] = entry; } } - uint8_t* image = malloc(header->image_size); + image = malloc(header->image_size); reader(image, header->image_size, ctx); - uint8_t* mask = NULL; if (sprite->has_mask) { mask = malloc(header->mask_size); reader(mask, header->mask_size, ctx); @@ -547,32 +557,36 @@ static rosprite_error rosprite_load_high_color(uint8_t* image_in, uint8_t* mask, struct rosprite* sprite, struct rosprite_header* header) { struct rosprite_mask_state* mask_state = NULL; + uint32_t currentByteIndex = 0; + uint32_t j, x, y, x_pixels, pixel; + bool has_alpha_pixel_data = false; + uint8_t b; + bool old_has_alpha; + if (sprite->has_mask) { ERRCHK(rosprite_init_mask_state(sprite, header, mask, &mask_state)); } sprite->image = malloc(sprite->width * sprite->height * 4); /* all image data is 32bpp going out */ - uint32_t currentByteIndex = 0; + /* Spec says that there must be no left-hand wastage */ + assert(header->first_used_bit == 0); + + { const uint32_t bpp = sprite->mode.colorbpp; const uint32_t bytesPerPixel = bpp / 8; const uint32_t row_max_bit = header->width_words * 32 - (31 - header->last_used_bit); /* Last used bit in row */ - bool has_alpha_pixel_data = false; - - /* Spec says that there must be no left-hand wastage */ - assert(header->first_used_bit == 0); - - for (uint32_t y = 0; y < sprite->height; y++) { - uint32_t x_pixels = 0; - for (uint32_t x = 0; x < row_max_bit; x += bpp) { - uint32_t pixel = 0; - for (uint32_t j = 0; j < bytesPerPixel; j++) { - uint8_t b = image_in[currentByteIndex++]; + for (y = 0; y < sprite->height; y++) { + x_pixels = 0; + for (x = 0; x < row_max_bit; x += bpp) { + pixel = 0; + for (j = 0; j < bytesPerPixel; j++) { + b = image_in[currentByteIndex++]; pixel = pixel | (b << (j * 8)); } - bool old_has_alpha = has_alpha_pixel_data; + old_has_alpha = has_alpha_pixel_data; pixel = rosprite_upscale_color(pixel, &(sprite->mode), &has_alpha_pixel_data); if (old_has_alpha != has_alpha_pixel_data && (y > 0 || x_pixels > 0)) { rosprite_fix_alpha(sprite->image, (y * sprite->width) + x_pixels - 1); @@ -590,7 +604,7 @@ currentByteIndex = (currentByteIndex + 3) & ~3; /* Round up to next multiple of 4 */ } } - + } if (sprite->has_mask) free(mask_state); return ROSPRITE_OK; } @@ -601,7 +615,8 @@ */ static inline void rosprite_fix_alpha(uint32_t* image, unsigned long pixels) { - for (uint32_t i = 0; i <= pixels; i++) { + uint32_t i; + for (i = 0; i <= pixels; i++) { image[i] = image[i] & 0xffffff00; } } @@ -613,6 +628,10 @@ */ static rosprite_error rosprite_load_low_color(uint8_t* image_in, uint8_t* mask, struct rosprite* sprite, struct rosprite_header* header) { + uint32_t current_byte_index, currentword; + uint32_t x, y, x_pixels, pixel; + uint8_t mask_pixel; + struct rosprite_mask_state* mask_state = NULL; if (sprite->has_mask) { ERRCHK(rosprite_init_mask_state(sprite, header, mask, &mask_state)); @@ -620,23 +639,24 @@ sprite->image = malloc(sprite->width * sprite->height * 4); /* all image data is 32bpp going out */ + { const uint32_t bpp = sprite->mode.colorbpp; const uint32_t row_max_bit = header->width_words * 32 - (31 - header->last_used_bit); /* Last used bit in row */ const uint32_t bitmask = (1 << bpp) - 1; /* creates a mask of 1s that is bpp bits wide */ - - uint32_t current_byte_index = 0; - uint32_t currentword = BTUINT((image_in + current_byte_index)); + + current_byte_index = 0; + currentword = BTUINT((image_in + current_byte_index)); current_byte_index += 4; - for (uint32_t y = 0; y < sprite->height; y++) { - uint32_t x_pixels = 0; - for (uint32_t x = header->first_used_bit; x < row_max_bit ; x += bpp) { + for (y = 0; y < sprite->height; y++) { + x_pixels = 0; + for (x = header->first_used_bit; x < row_max_bit ; x += bpp) { const uint32_t offset_into_word = x % 32; - uint32_t pixel = (currentword & (bitmask << offset_into_word)) >> offset_into_word; + pixel = (currentword & (bitmask << offset_into_word)) >> offset_into_word; pixel = rosprite_palette_lookup(sprite, pixel); /* lookup returns 32bpp */ if (sprite->has_mask) { - uint8_t mask_pixel = rosprite_next_mask_pixel(mask, mask_state); + mask_pixel = rosprite_next_mask_pixel(mask, mask_state); pixel = (pixel & 0xffffff00) | mask_pixel; } sprite->image[y*sprite->width + x_pixels] = pixel; @@ -655,7 +675,7 @@ current_byte_index += 4; } } - + } if (sprite->has_mask) free(mask_state); return ROSPRITE_OK; @@ -759,6 +779,7 @@ */ static uint32_t rosprite_upscale_color(uint32_t pixel, struct rosprite_mode* mode, bool* has_alpha_pixel_data) { + uint8_t alpha; switch (mode->colorbpp) { case 32: if (mode->color_model == ROSPRITE_RGB) { @@ -798,7 +819,7 @@ assert(false); /* unknown bpp */ } - uint8_t alpha = pixel & 0xff; + alpha = pixel & 0xff; if (alpha == 0x00) { if (!(*has_alpha_pixel_data)) { pixel = pixel | 0xff;

13 years, 1 month

1
0
0 / 0

r10862 vince - in /trunk/netsurf: Docs/BUILDING-Framebuffer Docs/USING-Framebuffer framebuffer/gui.c framebuffer/options.h

by netsurf＠semichrome.net

Author: vince Date: Mon Oct 4 10:50:39 2010 New Revision: 10862 URL: http://source.netsurf-browser.org?rev=10862&view=rev Log: Add flexible toolbar support and docuemnt it Added: trunk/netsurf/Docs/USING-Framebuffer Modified: trunk/netsurf/Docs/BUILDING-Framebuffer trunk/netsurf/framebuffer/gui.c trunk/netsurf/framebuffer/options.h Modified: trunk/netsurf/Docs/BUILDING-Framebuffer URL: http://source.netsurf-browser.org/trunk/netsurf/Docs/BUILDING-Framebuffer... ============================================================================== --- trunk/netsurf/Docs/BUILDING-Framebuffer (original) +++ trunk/netsurf/Docs/BUILDING-Framebuffer Mon Oct 4 10:50:39 2010 @@ -88,8 +88,9 @@ The font system is configured at runtime by several options. The fb_font_monochrome option causes the renderer to use monochrome - glyph rendering which is faster but less visually appealing. The - remaining seven options control the files to be used for font faces. + glyph rendering which is faster to plot but slower to render and + much less visually appealing. The remaining seven options control + the files to be used for font faces. fb_face_sans_serif - The sans serif face fb_face_sans_serif_bold - The bold sans serif face @@ -160,17 +161,17 @@ using the NetSurf Framebuffer library (libnsfb). This library provides an abstraction layer to input and output devices. - The frontend used by libnsfb is selected by using the -fe switch to - netsurf when executed. A frontend in this context is simply the - combination of input and output devices. - - A frontend output device may be any linearly mapped area of + The surface used by libnsfb is selected by using the -f switch to + NetSurf when executed. A surface in this context is simply the + combination of input and output devices. + + A surface output device may be any linearly mapped area of memory. The framebuffer may be treated as values at 32, 16 or 8 bits per pixel. The input device is typically selected to complement the - output device and is completely specific to the frontend. + output device and is completely specific to the surface. There are several configuration options which may influence the - framebuffer frontends. These are: + framebuffer surfaces. These are: fb_refresh - The refresh rate (for physical displays) fb_depth - The depth (in bits per pixel) of the framebuffer Added: trunk/netsurf/Docs/USING-Framebuffer URL: http://source.netsurf-browser.org/trunk/netsurf/Docs/USING-Framebuffer?re... ============================================================================== --- trunk/netsurf/Docs/USING-Framebuffer (added) +++ trunk/netsurf/Docs/USING-Framebuffer Mon Oct 4 10:50:39 2010 @@ -1,0 +1,181 @@ +-------------------------------------------------------------------------------- + Usage Instructions for Framebuffer NetSurf 2nd October 2010 +-------------------------------------------------------------------------------- + + This document provides usage instructions for the Framebuffer version of + NetSurf. + + Framebuffer NetSurf has been tested on Ubuntu and Debian. + +Overview +======== + + What it is + ---------- + + The NetSurf framebuffer front end is primarily intended for kiosk + and embedded applications where there is insufficient Operating + System support for a full graphical windowing environment. + + The framebuffer frontend features: + + * A trivial occluded rectangle window management toolkit + + * Font handling system using either: + - A trivial internal monochrome bitmap glyph set. + - An interface to fully anti-aliased glyphs using libfreetype 2 + + * Uses libnsfb to provide transparent support for: + - Numerous surface providers allowing usage on Linux, X, SDL, VNC + and any mapped linear memory region. + - Surface depths of 8, 16, 24 and 32bpp + - Optimised software plotters for lines, rectangles, polygons, + arbitrary ellipses (including circles), cubic and quadratic + splines, font glyphs and 32bpp RGBA bitmaps. + - Abstracted input handling. + + What it is not + -------------- + + The framebuffer frontend is not a replacement for full native + ports. It lacks functionality and flexibility compared to such + implementations. + + Limitations include: + - Single window interface. + - No tabbed interface. + - Expects to control the entire plotting surface. + - No ability to re-size a surface after initialisation. + - Inflexible input character mapping. + - Limited history view. + + In addition it should be noted support for some libnsfb surfaces has + been implemented purely for debugging functionality (SDL + especially) and is not intended to replace native surface + handlers. + + If a high level windowing system is available then a native NetSurf + frontend is almost certainly a better choice than attempting to use + the framebuffer frontend. + + If there is a graphical environment which supports GTK then using + the GTK frontend is a vastly superior choice. The framebuffer + frontend will appear exceptionally limited on such capable systems. + + +Configuring +=========== + + Several resources are set at *compile* time and are not changeable at + run time such as the icon bitmaps, the font system to use and what + default surface to use. Refer to the BUILDING-Framebuffer document + for details. + + Toolkit Options + --------------- + + The trivial toolkit has some configuration parameters allowing the + user to alter specific aspects of the UI. All the sizes are in + surface pixels however that is mapped. + + fb_furniture_size + This is the size allowed for the scroll bar elements. + + fb_toolbar_size + The height of the toolbar. + + fb_toolbar_layout + The layout of the toolbar, layout uses a string to define buttons + type and position each character adds an element to the toolbar: + + b - back + l - local history + f - forward + s - stop + r - refresh + u - url bar expands to fit remaining space + t - throbber/activity indicator + c - close the current window + + The default layout is "blfsrut" there should be no more than a + single url bar entry. If the option is set to the empty string (no + spaces permitted) the toolbar is disabled altogether. + + fb_osk + Whether the on screen keyboard should be enabled for input. + + + Framebuffer Surface + ------------------- + + There are four command line switches which override compiled in + defaults these are: + + -f <handler> + Selects a surface handler to pass to libnsfb instead of the + default. (e.g. x, sdl, mem, linux) + + -b <depth> + Selects the pixel depth to pass to libnsfb instead of the + compiled in default. (one of 8, 16, 24, 32) + + -w <width> + Selects the surface width to pass to libnsfb instead of the + compiled in default. + + -h <height> + Selects the surface height to pass to libnsfb instead of the + compiled in default. + + As with any NetSurf frontend run-time configuration is read from a + "Choices-fb" file. This file is a simple key:value list. In addition + to the standard values supported by the NetSurf core there are a + number of values to control specific aspects of the framebuffer + version. + + The libnsfb surface parameters are controlled with: + + fb_refresh - The refresh rate (for physical displays) + fb_depth - The depth (in bits per pixel) of the surface + fb_device - The path to the device (for physical displays) + fb_input_devpath - The path to the input devices (for linux input layer) + fb_input_glob - The input device selection glob (for linux input layer) + window_width - The width of the framebuffer + window_height - The height of the framebuffer + + The defaults are for 800 by 600 pixels at 16bpp and 70Hz refresh rate. + + The documentation of libnsfb should be consulted for further + information about supported surfaces and their configuration. + + Fonts + ----- + + If the compile time option is set to use the freetype font system + then several configuration options are available. If the simple + bitmap glyphs are used none of these options apply. + + The font glyphs are, by default, rendered as 256 level transparency + which gives excellent visual results even on small font sizes. + + The default font is the Vera truetype font set. The default path they + are sourced from is /usr/share/fonts/truetype/ttf-bitstream-vera/ . + + The font selection may be changed by placing truetype font files + in the resources path. The resource files will be the generic names + sans_serif.ttf, sans_serif_bold.ttf etc. The selection may also be + overridden by setting options. + + The font system is configured at run-time by several options. The + fb_font_monochrome option causes the renderer to use monochrome + glyph rendering which is faster to plot but slower to render and + much less visually appealing. The remaining seven options control + the files to be used for font faces. + + fb_face_sans_serif - The sans serif face + fb_face_sans_serif_bold - The bold sans serif face + fb_face_sans_serif_italic - The italic sans serif face + fb_face_sans_serif_italic_bold - The bold italic sans serif face. + fb_face_monospace - The monospaced font + fb_face_serif - The serif font + fb_serif_bold - The bold serif font Modified: trunk/netsurf/framebuffer/gui.c URL: http://source.netsurf-browser.org/trunk/netsurf/framebuffer/gui.c?rev=108... ============================================================================== --- trunk/netsurf/framebuffer/gui.c (original) +++ trunk/netsurf/framebuffer/gui.c Mon Oct 4 10:50:39 2010 @@ -59,6 +59,8 @@ #include "desktop/history_core.h" #include "content/fetch.h" +#define NSFB_TOOLBAR_DEFAULT_LAYOUT "blfsrut" + char *default_stylesheet_url; char *quirks_stylesheet_url; char *adblock_stylesheet_url; @@ -836,6 +838,16 @@ return 0; } +/* close browser window icon click routine */ +static int +fb_close_click(fbtk_widget_t *widget, fbtk_callback_info *cbi) +{ + if (cbi->event->type != NSFB_EVENT_KEY_DOWN) + return 0; + + netsurf_quit = true; + return 0; +} static int fb_scroll_callback(fbtk_widget_t *widget, fbtk_callback_info *cbi) @@ -893,121 +905,283 @@ } - -static void -create_toolbar(struct gui_window *gw, int toolbar_height) +/** Create a toolbar window and populate it with buttons. + * + * The toolbar layout uses a character to define buttons type and position: + * b - back + * l - local history + * f - forward + * s - stop + * r - refresh + * u - url bar expands to fit remaining space + * t - throbber/activity indicator + * c - close the current window + * + * The default layout is "blfsrut" there should be no more than a + * single url bar entry or behaviour will be undefined. + * + * @param gw Parent window + * @param toolbar_height The height in pixels of the toolbar + * @param padding The padding in pixels round each element of the toolbar + * @param frame_col Frame colour. + * @param toolbar_layout A string defining which buttons and controls + * should be added to the toolbar. May be empty + * string to disable the bar.. + * + */ +static fbtk_widget_t * +create_toolbar(struct gui_window *gw, + int toolbar_height, + int padding, + colour frame_col, + const char *toolbar_layout) { fbtk_widget_t *toolbar; fbtk_widget_t *widget; - int url_bar_height = 0; - int xpos = 0; - int spacing_width = 0; - - spacing_width = 2; - - xpos = spacing_width; - - url_bar_height = toolbar_height - 6; - - toolbar = fbtk_create_window(gw->window, 0, 0, 0, toolbar_height, FB_FRAME_COLOUR); - fbtk_set_handler(toolbar, FBTK_CBT_POINTERENTER, set_ptr_default_move, NULL); - - /* back button */ - gw->back = fbtk_create_button(toolbar, xpos, spacing_width, left_arrow.width, -spacing_width, FB_FRAME_COLOUR, &left_arrow, fb_leftarrow_click, gw); - xpos += left_arrow.width + spacing_width; - - /* history window */ - widget = fbtk_create_button(toolbar, - xpos, - spacing_width, - history_image.width, - -spacing_width, - FB_FRAME_COLOUR, - &history_image, - fb_localhistory_btn_clik, - gw); - xpos += fbtk_get_width(widget) + spacing_width; - - /* forward button */ - gw->forward = fbtk_create_button(toolbar, - xpos, - spacing_width, - right_arrow.width, - -spacing_width, - FB_FRAME_COLOUR, - &right_arrow, - fb_rightarrow_click, - gw); - xpos += right_arrow.width + spacing_width; - - /* stop button */ - widget = fbtk_create_button(toolbar, - xpos, - spacing_width, - stop_image.width, - -spacing_width, - FB_FRAME_COLOUR, - &stop_image, - fb_stop_click, - gw->bw); - xpos += stop_image.width + spacing_width; - - /* reload button */ - widget = fbtk_create_button(toolbar, - xpos, - spacing_width, - reload.width, - -spacing_width, - FB_FRAME_COLOUR, - &reload, - fb_reload_click, - gw->bw); - xpos += reload.width + spacing_width; - - /* url widget */ - xpos += spacing_width; /* extra spacing for url bar */ - gw->url = fbtk_create_writable_text(toolbar, - xpos, - spacing_width, - -(2 * spacing_width + throbber0.width), - -spacing_width, - FB_COLOUR_WHITE, - FB_COLOUR_BLACK, - true, - fb_url_enter, - gw->bw); - fbtk_set_handler(gw->url, FBTK_CBT_POINTERENTER, fb_url_move, gw->bw); - xpos += fbtk_get_width(gw->url) + spacing_width; - - /* throbber */ - gw->throbber = fbtk_create_bitmap(toolbar, - xpos, - spacing_width, - throbber0.width, - -spacing_width, - FB_FRAME_COLOUR, &throbber0); + + int xpos; /* The position of the next widget. */ + int xlhs; /* extent of the left hand side widgets */ + int xdir = 1; /* the direction of movement + or - 1 */ + const char *itmtype; /* type of the next item */ + + if (toolbar_layout == NULL) { + toolbar_layout = NSFB_TOOLBAR_DEFAULT_LAYOUT; + } + + LOG(("Using toolbar layout %s", toolbar_layout)); + + itmtype = toolbar_layout; + + if (*itmtype == 0) { + return NULL; + } + + toolbar = fbtk_create_window(gw->window, 0, 0, 0, + toolbar_height, + frame_col); + + if (toolbar == NULL) { + return NULL; + } + + fbtk_set_handler(toolbar, + FBTK_CBT_POINTERENTER, + set_ptr_default_move, + NULL); + + + xpos = padding; + + /* loop proceeds creating widget on the left hand side until + * it runs out of layout or encounters a url bar declaration + * wherupon it works backwards from the end of the layout + * untill the space left is for the url bar + */ + while ((itmtype >= toolbar_layout) && + (*itmtype != 0) && + (xdir !=0)) { + + LOG(("toolbar adding %c", *itmtype)); + + + switch (*itmtype) { + + case 'b': /* back */ + widget = fbtk_create_button(toolbar, + (xdir == 1) ? xpos : + xpos - left_arrow.width, + padding, + left_arrow.width, + -padding, + frame_col, + &left_arrow, + fb_leftarrow_click, + gw); + gw->back = widget; /* keep reference */ + break; + + case 'l': /* local history */ + widget = fbtk_create_button(toolbar, + (xdir == 1) ? xpos : + xpos - history_image.width, + padding, + history_image.width, + -padding, + frame_col, + &history_image, + fb_localhistory_btn_clik, + gw); + break; + + case 'f': /* forward */ + widget = fbtk_create_button(toolbar, + (xdir == 1)?xpos : + xpos - right_arrow.width, + padding, + right_arrow.width, + -padding, + frame_col, + &right_arrow, + fb_rightarrow_click, + gw); + gw->forward = widget; + break; + + case 'c': /* close the current window */ + widget = fbtk_create_button(toolbar, + (xdir == 1)?xpos : + xpos - stop_image_g.width, + padding, + stop_image_g.width, + -padding, + frame_col, + &stop_image_g, + fb_close_click, + gw->bw); + break; + + case 's': /* stop */ + widget = fbtk_create_button(toolbar, + (xdir == 1)?xpos : + xpos - stop_image.width, + padding, + stop_image.width, + -padding, + frame_col, + &stop_image, + fb_stop_click, + gw->bw); + break; + + case 'r': /* reload */ + widget = fbtk_create_button(toolbar, + (xdir == 1)?xpos : + xpos - reload.width, + padding, + reload.width, + -padding, + frame_col, + &reload, + fb_reload_click, + gw->bw); + break; + + case 't': /* throbber/activity indicator */ + widget = fbtk_create_bitmap(toolbar, + (xdir == 1)?xpos : + xpos - throbber0.width, + padding, + throbber0.width, + -padding, + frame_col, + &throbber0); + gw->throbber = widget; + break; + + + case 'u': /* url bar*/ + if (xdir == -1) { + /* met the u going backwards add url + * now we know available extent + */ + + widget = fbtk_create_writable_text(toolbar, + xlhs, + padding, + xpos - xlhs, + -padding, + FB_COLOUR_WHITE, + FB_COLOUR_BLACK, + true, + fb_url_enter, + gw->bw); + + fbtk_set_handler(widget, + FBTK_CBT_POINTERENTER, + fb_url_move, gw->bw); + + gw->url = widget; /* keep reference */ + + /* toolbar is complete */ + xdir = 0; + break; + } + /* met url going forwards, note position and + * reverse direction + */ + itmtype = toolbar_layout + strlen(toolbar_layout); + xdir = -1; + xlhs = xpos; + xpos = (2 * fbtk_get_width(toolbar)); + widget = toolbar; + break; + + default: + xdir = 0; + LOG(("Unknown element %c in toolbar layout", *itmtype)); + break; + + } + + xpos += (xdir * (fbtk_get_width(widget) + padding)); + + LOG(("xpos is %d",xpos)); + + itmtype += xdir; + } fbtk_set_mapping(toolbar, true); + return toolbar; } static void -create_normal_browser_window(struct gui_window *gw, - int furniture_width, - int toolbar_height) +create_browser_widget(struct gui_window *gw, int toolbar_height, int furniture_width) +{ + struct browser_widget_s *browser_widget; + browser_widget = calloc(1, sizeof(struct browser_widget_s)); + + gw->browser = fbtk_create_user(gw->window, + 0, + toolbar_height, + -furniture_width, + -furniture_width, + browser_widget); + + fbtk_set_handler(gw->browser, FBTK_CBT_REDRAW, fb_browser_window_redraw, gw); + fbtk_set_handler(gw->browser, FBTK_CBT_INPUT, fb_browser_window_input, gw); + fbtk_set_handler(gw->browser, FBTK_CBT_CLICK, fb_browser_window_click, gw); + fbtk_set_handler(gw->browser, FBTK_CBT_POINTERMOVE, fb_browser_window_move, gw); +} + +static void +create_normal_browser_window(struct gui_window *gw, int furniture_width) { fbtk_widget_t *widget; + fbtk_widget_t *toolbar; int statusbar_width = 0; + int toolbar_height = option_fb_toolbar_size; + + LOG(("Normal window")); gw->window = fbtk_create_window(fbtk, 0, 0, 0, 0, 0); statusbar_width = option_toolbar_status_width * fbtk_get_width(gw->window) / 10000; - - LOG(("Normal window")); - - create_toolbar(gw, toolbar_height); + /* toolbar */ + toolbar = create_toolbar(gw, + toolbar_height, + 2, + FB_FRAME_COLOUR, + option_fb_toolbar_layout); + + /* set the actually created toolbar height */ + if (toolbar != NULL) { + toolbar_height = fbtk_get_height(toolbar); + } else { + toolbar_height = 0; + } /* status bar */ gw->status = fbtk_create_text(gw->window, @@ -1065,27 +1239,11 @@ fb_scroll_callback, gw); - -} - -static void -create_browser_widget(struct gui_window *gw, int toolbar_height, int furniture_width) -{ - struct browser_widget_s *browser_widget; - browser_widget = calloc(1, sizeof(struct browser_widget_s)); - - gw->browser = fbtk_create_user(gw->window, - 0, - toolbar_height, - -furniture_width, - -furniture_width, - browser_widget); - - fbtk_set_handler(gw->browser, FBTK_CBT_REDRAW, fb_browser_window_redraw, gw); - fbtk_set_handler(gw->browser, FBTK_CBT_INPUT, fb_browser_window_input, gw); - fbtk_set_handler(gw->browser, FBTK_CBT_CLICK, fb_browser_window_click, gw); - fbtk_set_handler(gw->browser, FBTK_CBT_POINTERMOVE, fb_browser_window_move, gw); -} + /* browser widget */ + create_browser_widget(gw, toolbar_height, option_fb_furniture_size); + +} + struct gui_window * gui_create_browser_window(struct browser_window *bw, @@ -1107,9 +1265,8 @@ switch(bw->browser_window_type) { case BROWSER_WINDOW_NORMAL: - create_normal_browser_window(gw, option_fb_furniture_size, option_fb_toolbar_size); + create_normal_browser_window(gw, option_fb_furniture_size); gw->localhistory = fb_create_localhistory(bw, fbtk, option_fb_furniture_size); - create_browser_widget(gw, option_fb_toolbar_size, option_fb_furniture_size); /* map and request redraw of gui window */ fbtk_set_mapping(gw->window, true); Modified: trunk/netsurf/framebuffer/options.h URL: http://source.netsurf-browser.org/trunk/netsurf/framebuffer/options.h?rev... ============================================================================== --- trunk/netsurf/framebuffer/options.h (original) +++ trunk/netsurf/framebuffer/options.h Mon Oct 4 10:50:39 2010 @@ -28,6 +28,7 @@ extern char *option_fb_input_glob; extern int option_fb_furniture_size; /* toolkit furniture size */ extern int option_fb_toolbar_size; /* toolbar furniture size */ +extern char *option_fb_toolbar_layout; /* toolbar layout */ extern bool option_fb_osk; /* enable on screen keyboard */ extern bool option_fb_font_monochrome; /* render font monochrome */ @@ -47,6 +48,7 @@ char *option_fb_input_glob = 0; \ int option_fb_furniture_size = 18; \ int option_fb_toolbar_size = 30; \ + char *option_fb_toolbar_layout; \ bool option_fb_osk = false; \ bool option_fb_font_monochrome = false; \ char *option_fb_face_sans_serif; \ @@ -65,7 +67,8 @@ { "fb_input_glob", OPTION_STRING, &option_fb_input_glob }, \ { "fb_furniture_size", OPTION_INTEGER, &option_fb_furniture_size }, \ { "fb_toolbar_size", OPTION_INTEGER, &option_fb_toolbar_size }, \ - { "fb_font_osk", OPTION_BOOL, &option_fb_osk }, \ + { "fb_toolbar_layout", OPTION_STRING, &option_fb_toolbar_layout }, \ + { "fb_osk", OPTION_BOOL, &option_fb_osk }, \ { "fb_font_monochrome", OPTION_BOOL, &option_fb_font_monochrome }, \ { "fb_face_sans_serif", OPTION_STRING, &option_fb_face_sans_serif }, \ { "fb_face_sans_serif_bold", OPTION_STRING, &option_fb_face_sans_serif_bold }, \

13 years, 1 month

1
0
0 / 0

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

netsurf-commits October 2010