Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/786a5186aa38897170317d453bf49b55cf8e70a3
...commit
http://git.netsurf-browser.org/netsurf.git/commit/786a5186aa38897170317d453bf49b55cf8e70a3
...tree
http://git.netsurf-browser.org/netsurf.git/tree/786a5186aa38897170317d453bf49b55cf8e70a3
The branch, master has been updated
via 786a5186aa38897170317d453bf49b55cf8e70a3 (commit)
via ee4346c26ef98af4bc60796a337d332665602d79 (commit)
via 5ac9c7128ad67e3e678ca6709174b8f77bcc1875 (commit)
from c7766fddff000614de3e1467e39cdfb0301a022d (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/786a5186aa38897170317d453bf49b55cf8e70a3
commit 786a5186aa38897170317d453bf49b55cf8e70a3
Author: Chris Young <[email protected]>
Commit: Chris Young <[email protected]>
Updated documentation with some post-2.9 changes
diff --git a/amiga/dist/NetSurf.guide b/amiga/dist/NetSurf.guide
index e1135f4..c7388bf 100755
--- a/amiga/dist/NetSurf.guide
+++ b/amiga/dist/NetSurf.guide
@@ -42,10 +42,14 @@ There are a couple of Amiga-specific options which can only
be changed directly
@{b}kiosk_mode@{ub} No gadgets
@{b}printer_unit@{ub} Specifies which printer.device unit to print to
@{b}drag_save_icons@{ub} Enables displaying Workbench-style transparent icons
under the pointer when performing drag saves (ctrl-drag of objects available if
NetSurf is running on the Workbench screen) and text selection drags. If set
to 0 the pointer style will change instead. OS 4.0 users may want to set this
to 0 as icons will appear opaque and obscure the drop position.
-@{b}cairo_renderer@{ub} Set rendering engine (SObjs version only). 0 =
graphics.library, 1 = Cairo/graphics.library mixed (recommended), 2 = Full
Cairo.
+@{b}cairo_renderer@{ub} Set rendering engine. -1 = palette-mapped (set
automatically when required), 0 = graphics.library, 1 = Cairo/graphics.library
mixed (recommended), 2 = Full Cairo.
@{b}monitor_aspect_x@{ub}/@{b}monitor_aspect_y@{ub} Correct aspect ratio for
displays (default of 0 means "assume square pixels").
@{b}screen_compositing@{ub} Use compositing on NetSurf's own screen.
0=disable, 1=enable, 2=default
@{b}redraw_tile_size_x@{ub}/@{b}redraw_tile_size_y@{ub} Specify the size of
the off-screen bitmap. Higher will speed up redraws at the expense of memory. 0
disables tiling (will use a bitmap at least the size of the screen NetSurf is
running on)
+@{b}font_antialiasing@{ub} Switch text anti-aliasing on or off. Defaults to on
in true-colour modes, but text rendering performance can be improved by setting
to 0.
+
+@{b}dithering_quality@{ub} Specify the dithering quality from all values
supported by picture.datatype. Currently these are 0=None, 1=Normal, 2=High
quality. Other values are undefined. This is only used when NetSurf is running
in palette-mapped mode.
+@{b}mask_alpha@{ub} Threshold to use when determining which alpha values to
convert to full transparency (0 - 255, where 255 will convert even opaque
pixels to transparent). Defaults to 50 (0x32). This is only used in
palette-mapped modes where alpha blending is not currently supported.
@{b}url_file@{ub} Path to URL database file
@{b}hotlist_file@{ub} Path to Hotlist file
@@ -69,11 +73,15 @@ If the font NetSurf is trying to use does not contain a
specific character used
For most users, installing and selecting @{"Code2000" rxs "address netsurf
'open http://code2000.sf.net'"} or @{"Bitstream Cyberbit" rxs "address netsurf
'open http://ftp.netscape.com/pub/communicator/extras/fonts/windows/'"} is the
best option.
+Additional fall-back fonts can be provided since NetSurf 3.0. These need to go
into Users/user/Choices as a comma-separated list, for the font_unicode_list
option.
+
+NB: Since NetSurf 3.0, NetSurf will scan the provided Unicode fonts, and the
rest of the system fonts, on first startup. Setting font_unicode_only:1 will
prevent fonts not in the preferred Unicode fonts list from being scanned or
used as fallback fonts. If the system fonts or NetSurf's fallback fonts list
changes, this cache will need to be re-generated. This can be forced by
deleting the font glyph cache (which defaults to Users/user/FontGlyphCache).
+
@{b}Font sizes@{ub}
The default and minimum font sizes can also be set.
NB: The resolution setting on the "Rendering" tab in NetSurf's preferences
affects how big text appears on screen (the conversion between point and pixel
sizes) amongst other things. To find the correct value, divide the number of
pixels on the screen vertically by the physical height of the screen in inches
(horizontal resolution is calculated automatically if NetSurf is running on a
custom screen, square pixels are assumed on all other screens).
-If the monitor is widescreen, monitor_aspect_x and monitor_aspect_y values in
Users/Default/Choices will also need modifying.
+If the monitor is widescreen, monitor_aspect_x and monitor_aspect_y values in
Users/Default/Choices may also need modifying.
@endnode
@node Themes
@@ -266,6 +274,8 @@ Deselect @{b}Higher quality scaling@{ub}, this will be very
slow if not done in
@{lindent 2}* In @{"Options" link Options}, set cairo_renderer:1@{lindent}
@{lindent 2}* In @{"Options" link Options}, increase redraw_tile_size_x/y
(increasing this value uses more graphics mem)@{lindent}
+
+@{lindent 2}* In @{"Options" link Options}, set font_antialiasing:0@{lindent}
@endnode
@node contact "Credits"
commitdiff
http://git.netsurf-browser.org/netsurf.git/commitdiff/ee4346c26ef98af4bc60796a337d332665602d79
commit ee4346c26ef98af4bc60796a337d332665602d79
Author: Chris Young <[email protected]>
Commit: Chris Young <[email protected]>
correct logic
diff --git a/amiga/plotters.c b/amiga/plotters.c
index dc0ae2f..8d54444 100755
--- a/amiga/plotters.c
+++ b/amiga/plotters.c
@@ -550,7 +550,7 @@ bool ami_text(int x, int y, const char *text, size_t length,
bool aa = true;
- if((nsoption_bool(font_antialiasing) == false) || (palette_mapped ==
false))
+ if((nsoption_bool(font_antialiasing) == false) || (palette_mapped ==
true))
aa = false;
ami_plot_setapen(fstyle->foreground);
commitdiff
http://git.netsurf-browser.org/netsurf.git/commitdiff/5ac9c7128ad67e3e678ca6709174b8f77bcc1875
commit 5ac9c7128ad67e3e678ca6709174b8f77bcc1875
Author: Chris Young <[email protected]>
Commit: Chris Young <[email protected]>
allow font anti-aliasing to be switched off in true-colour modes
diff --git a/amiga/options.h b/amiga/options.h
index de2e75f..8d026cf 100644
--- a/amiga/options.h
+++ b/amiga/options.h
@@ -61,6 +61,7 @@
char *font_unicode_list; \
char *font_unicode_file; \
bool font_unicode_only; \
+ bool font_antialiasing; \
bool drag_save_icons; \
int hotlist_window_xpos; \
int hotlist_window_ypos; \
@@ -123,6 +124,7 @@
.font_unicode_list = NULL, \
.font_unicode_file = NULL, \
.font_unicode_only = false, \
+ .font_antialiasing = true, \
.drag_save_icons = true, \
.hotlist_window_xpos = 0, \
.hotlist_window_ypos = 0, \
@@ -184,6 +186,7 @@
{ "font_unicode_list", OPTION_STRING, &nsoptions.font_unicode_list }, \
{ "font_unicode_file", OPTION_STRING, &nsoptions.font_unicode_file }, \
{ "font_unicode_only", OPTION_BOOL, &nsoptions.font_unicode_only }, \
+{ "font_antialiasing", OPTION_BOOL, &nsoptions.font_antialiasing }, \
{ "drag_save_icons", OPTION_BOOL, &nsoptions.drag_save_icons}, \
{ "hotlist_window_xpos", OPTION_INTEGER, &nsoptions.hotlist_window_xpos}, \
{ "hotlist_window_ypos", OPTION_INTEGER, &nsoptions.hotlist_window_ypos}, \
diff --git a/amiga/plotters.c b/amiga/plotters.c
index 9d86fde..dc0ae2f 100755
--- a/amiga/plotters.c
+++ b/amiga/plotters.c
@@ -548,8 +548,13 @@ bool ami_text(int x, int y, const char *text, size_t
length,
LOG(("[ami_plotter] Entered ami_text()"));
#endif
+ bool aa = true;
+
+ if((nsoption_bool(font_antialiasing) == false) || (palette_mapped ==
false))
+ aa = false;
+
ami_plot_setapen(fstyle->foreground);
- ami_unicode_text(glob->rp, text, length, fstyle, x, y, !palette_mapped);
+ ami_unicode_text(glob->rp, text, length, fstyle, x, y, aa);
return true;
}
-----------------------------------------------------------------------
Summary of changes:
amiga/dist/NetSurf.guide | 14 ++++++++++++--
amiga/options.h | 3 +++
amiga/plotters.c | 7 ++++++-
3 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/amiga/dist/NetSurf.guide b/amiga/dist/NetSurf.guide
index e1135f4..c7388bf 100755
--- a/amiga/dist/NetSurf.guide
+++ b/amiga/dist/NetSurf.guide
@@ -42,10 +42,14 @@ There are a couple of Amiga-specific options which can only
be changed directly
@{b}kiosk_mode@{ub} No gadgets
@{b}printer_unit@{ub} Specifies which printer.device unit to print to
@{b}drag_save_icons@{ub} Enables displaying Workbench-style transparent icons
under the pointer when performing drag saves (ctrl-drag of objects available if
NetSurf is running on the Workbench screen) and text selection drags. If set
to 0 the pointer style will change instead. OS 4.0 users may want to set this
to 0 as icons will appear opaque and obscure the drop position.
-@{b}cairo_renderer@{ub} Set rendering engine (SObjs version only). 0 =
graphics.library, 1 = Cairo/graphics.library mixed (recommended), 2 = Full
Cairo.
+@{b}cairo_renderer@{ub} Set rendering engine. -1 = palette-mapped (set
automatically when required), 0 = graphics.library, 1 = Cairo/graphics.library
mixed (recommended), 2 = Full Cairo.
@{b}monitor_aspect_x@{ub}/@{b}monitor_aspect_y@{ub} Correct aspect ratio for
displays (default of 0 means "assume square pixels").
@{b}screen_compositing@{ub} Use compositing on NetSurf's own screen.
0=disable, 1=enable, 2=default
@{b}redraw_tile_size_x@{ub}/@{b}redraw_tile_size_y@{ub} Specify the size of
the off-screen bitmap. Higher will speed up redraws at the expense of memory. 0
disables tiling (will use a bitmap at least the size of the screen NetSurf is
running on)
+@{b}font_antialiasing@{ub} Switch text anti-aliasing on or off. Defaults to on
in true-colour modes, but text rendering performance can be improved by setting
to 0.
+
+@{b}dithering_quality@{ub} Specify the dithering quality from all values
supported by picture.datatype. Currently these are 0=None, 1=Normal, 2=High
quality. Other values are undefined. This is only used when NetSurf is running
in palette-mapped mode.
+@{b}mask_alpha@{ub} Threshold to use when determining which alpha values to
convert to full transparency (0 - 255, where 255 will convert even opaque
pixels to transparent). Defaults to 50 (0x32). This is only used in
palette-mapped modes where alpha blending is not currently supported.
@{b}url_file@{ub} Path to URL database file
@{b}hotlist_file@{ub} Path to Hotlist file
@@ -69,11 +73,15 @@ If the font NetSurf is trying to use does not contain a
specific character used
For most users, installing and selecting @{"Code2000" rxs "address netsurf
'open http://code2000.sf.net'"} or @{"Bitstream Cyberbit" rxs "address netsurf
'open http://ftp.netscape.com/pub/communicator/extras/fonts/windows/'"} is the
best option.
+Additional fall-back fonts can be provided since NetSurf 3.0. These need to go
into Users/user/Choices as a comma-separated list, for the font_unicode_list
option.
+
+NB: Since NetSurf 3.0, NetSurf will scan the provided Unicode fonts, and the
rest of the system fonts, on first startup. Setting font_unicode_only:1 will
prevent fonts not in the preferred Unicode fonts list from being scanned or
used as fallback fonts. If the system fonts or NetSurf's fallback fonts list
changes, this cache will need to be re-generated. This can be forced by
deleting the font glyph cache (which defaults to Users/user/FontGlyphCache).
+
@{b}Font sizes@{ub}
The default and minimum font sizes can also be set.
NB: The resolution setting on the "Rendering" tab in NetSurf's preferences
affects how big text appears on screen (the conversion between point and pixel
sizes) amongst other things. To find the correct value, divide the number of
pixels on the screen vertically by the physical height of the screen in inches
(horizontal resolution is calculated automatically if NetSurf is running on a
custom screen, square pixels are assumed on all other screens).
-If the monitor is widescreen, monitor_aspect_x and monitor_aspect_y values in
Users/Default/Choices will also need modifying.
+If the monitor is widescreen, monitor_aspect_x and monitor_aspect_y values in
Users/Default/Choices may also need modifying.
@endnode
@node Themes
@@ -266,6 +274,8 @@ Deselect @{b}Higher quality scaling@{ub}, this will be very
slow if not done in
@{lindent 2}* In @{"Options" link Options}, set cairo_renderer:1@{lindent}
@{lindent 2}* In @{"Options" link Options}, increase redraw_tile_size_x/y
(increasing this value uses more graphics mem)@{lindent}
+
+@{lindent 2}* In @{"Options" link Options}, set font_antialiasing:0@{lindent}
@endnode
@node contact "Credits"
diff --git a/amiga/options.h b/amiga/options.h
index de2e75f..8d026cf 100644
--- a/amiga/options.h
+++ b/amiga/options.h
@@ -61,6 +61,7 @@
char *font_unicode_list; \
char *font_unicode_file; \
bool font_unicode_only; \
+ bool font_antialiasing; \
bool drag_save_icons; \
int hotlist_window_xpos; \
int hotlist_window_ypos; \
@@ -123,6 +124,7 @@
.font_unicode_list = NULL, \
.font_unicode_file = NULL, \
.font_unicode_only = false, \
+ .font_antialiasing = true, \
.drag_save_icons = true, \
.hotlist_window_xpos = 0, \
.hotlist_window_ypos = 0, \
@@ -184,6 +186,7 @@
{ "font_unicode_list", OPTION_STRING, &nsoptions.font_unicode_list }, \
{ "font_unicode_file", OPTION_STRING, &nsoptions.font_unicode_file }, \
{ "font_unicode_only", OPTION_BOOL, &nsoptions.font_unicode_only }, \
+{ "font_antialiasing", OPTION_BOOL, &nsoptions.font_antialiasing }, \
{ "drag_save_icons", OPTION_BOOL, &nsoptions.drag_save_icons}, \
{ "hotlist_window_xpos", OPTION_INTEGER, &nsoptions.hotlist_window_xpos}, \
{ "hotlist_window_ypos", OPTION_INTEGER, &nsoptions.hotlist_window_ypos}, \
diff --git a/amiga/plotters.c b/amiga/plotters.c
index 9d86fde..8d54444 100755
--- a/amiga/plotters.c
+++ b/amiga/plotters.c
@@ -548,8 +548,13 @@ bool ami_text(int x, int y, const char *text, size_t
length,
LOG(("[ami_plotter] Entered ami_text()"));
#endif
+ bool aa = true;
+
+ if((nsoption_bool(font_antialiasing) == false) || (palette_mapped ==
true))
+ aa = false;
+
ami_plot_setapen(fstyle->foreground);
- ami_unicode_text(glob->rp, text, length, fstyle, x, y, !palette_mapped);
+ ami_unicode_text(glob->rp, text, length, fstyle, x, y, aa);
return true;
}
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list
[email protected]
http://vlists.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
