Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/862756a1a47553f317970f3a04fce3bd204792f6
...commit
http://git.netsurf-browser.org/netsurf.git/commit/862756a1a47553f317970f3a04fce3bd204792f6
...tree
http://git.netsurf-browser.org/netsurf.git/tree/862756a1a47553f317970f3a04fce3bd204792f6
The branch, master has been updated
via 862756a1a47553f317970f3a04fce3bd204792f6 (commit)
via d51cf1a789e8d4b1527fa11553ffe059809511cb (commit)
via 9ab9eabfa6a0da2cfc5badc35bcb5e78537e139b (commit)
via a558f12b53a6188c5185548636d8ae63ebd4b941 (commit)
via 7d32feecc002a8e1193c0c7dcc16503ebd045c43 (commit)
from eb7037ac4fa71a3cfe86bcb7e32d750b4e7c14a7 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=862756a1a47553f317970f3a04fce3bd204792f6
commit 862756a1a47553f317970f3a04fce3bd204792f6
Author: John-Mark Bell <[email protected]>
Commit: John-Mark Bell <[email protected]>
RISC OS: initialise font subsystem after Wimp_Initialise
If RUfl detects it is running in a Wimp task it will display a
progress meter while scanning fonts. We had this behaviour until
~2017, when it became broken due to the font initialisation being
moved before the call to Wimp_Initialise (because the hotlist
display logic got moved to the treeview, which needs fonts set up)
Move both the font and hotlist initialisation after the call to
Wimp_Initialise to restore the desired behaviour.
diff --git a/frontends/riscos/gui.c b/frontends/riscos/gui.c
index f9268ca..6b8f1a5 100644
--- a/frontends/riscos/gui.c
+++ b/frontends/riscos/gui.c
@@ -1231,16 +1231,9 @@ static nserror gui_init(int argc, char** argv)
/* Initialise save complete functionality */
save_complete_init();
- /* Initialise the font subsystem */
- nsfont_init();
-
- /* Load in visited URLs, Cookies, and hostlist */
+ /* Load in visited URLs and Cookies */
urldb_load(nsoption_charp(url_path));
urldb_load_cookies(nsoption_charp(cookie_file));
- hotlist_init(nsoption_charp(hotlist_path),
- nsoption_bool(external_hotlists) ?
- NULL :
- nsoption_charp(hotlist_save));
/* Initialise with the wimp */
error = xwimp_initialise(wimp_VERSION_RO38, task_name,
@@ -1271,6 +1264,15 @@ static nserror gui_init(int argc, char** argv)
ro_message_register_route(message_WINDOW_INFO,
ro_msg_window_info);
+ /* Initialise the font subsystem (must be after Wimp_Initialise) */
+ nsfont_init();
+
+ /* Initialise the hotlist (must be after fonts) */
+ hotlist_init(nsoption_charp(hotlist_path),
+ nsoption_bool(external_hotlists) ?
+ NULL :
+ nsoption_charp(hotlist_save));
+
/* Initialise global information */
ro_gui_get_screen_properties();
ro_gui_wimp_get_desktop_font();
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=d51cf1a789e8d4b1527fa11553ffe059809511cb
commit d51cf1a789e8d4b1527fa11553ffe059809511cb
Author: John-Mark Bell <[email protected]>
Commit: John-Mark Bell <[email protected]>
RISC OS: fix up following RUfl API change
diff --git a/frontends/riscos/print.c b/frontends/riscos/print.c
index b390c69..e87f478 100644
--- a/frontends/riscos/print.c
+++ b/frontends/riscos/print.c
@@ -106,7 +106,7 @@ static bool print_document(struct gui_window *g, const char
*filename);
static const char *print_declare_fonts(struct hlcache_handle *h);
static void print_fonts_callback(void *context,
const char *font_name, unsigned int font_size,
- const char *s8, unsigned short *s16, unsigned int n,
+ const uint8_t *s8, const uint32_t *s32, unsigned int n,
int x, int y);
@@ -998,7 +998,7 @@ end:
void print_fonts_callback(void *context,
const char *font_name, unsigned int font_size,
- const char *s8, unsigned short *s16, unsigned int n,
+ const uint8_t *s8, const uint32_t *s32, unsigned int n,
int x, int y)
{
unsigned int i;
@@ -1009,7 +1009,7 @@ void print_fonts_callback(void *context,
(void) x; /* unused */
(void) y; /* unused */
- assert(s8 || s16);
+ assert(s8 || s32);
/* check if the font name is new */
for (i = 0; i != print_fonts_count &&
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=9ab9eabfa6a0da2cfc5badc35bcb5e78537e139b
commit 9ab9eabfa6a0da2cfc5badc35bcb5e78537e139b
Author: John-Mark Bell <[email protected]>
Commit: John-Mark Bell <[email protected]>
Browser window: include theme.h
This is necessary to avoid a warning on platforms that support
theme installation.
diff --git a/desktop/browser_window.c b/desktop/browser_window.c
index 38ae774..c70db7c 100644
--- a/desktop/browser_window.c
+++ b/desktop/browser_window.c
@@ -62,6 +62,7 @@
#include "desktop/hotlist.h"
#include "desktop/knockout.h"
#include "desktop/browser_history.h"
+#include "desktop/theme.h"
#ifdef WITH_THEME_INSTALL
#include "desktop/theme.h"
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=a558f12b53a6188c5185548636d8ae63ebd4b941
commit a558f12b53a6188c5185548636d8ae63ebd4b941
Author: John-Mark Bell <[email protected]>
Commit: John-Mark Bell <[email protected]>
Save complete: silence warning
Not all runtime library headers declare the first argument to
regexec as being const so don't make our snregexec wrapper do so.
Additionally, make save_complete_import_re static.
diff --git a/desktop/save_complete.c b/desktop/save_complete.c
index 24c1881..e4fadd2 100644
--- a/desktop/save_complete.c
+++ b/desktop/save_complete.c
@@ -51,7 +51,7 @@
#include "desktop/gui_internal.h"
#include "desktop/save_complete.h"
-regex_t save_complete_import_re;
+static regex_t save_complete_import_re;
/** An entry in save_complete_list. */
typedef struct save_complete_entry {
@@ -196,7 +196,7 @@ save_complete_save_buffer(save_complete_ctx *ctx,
* perform a posix regexec on a string without a null terminator
*/
static int
-snregexec(const regex_t *preg,
+snregexec(regex_t *preg,
const char *string,
size_t stringlen,
size_t nmatch,
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=7d32feecc002a8e1193c0c7dcc16503ebd045c43
commit 7d32feecc002a8e1193c0c7dcc16503ebd045c43
Author: John-Mark Bell <[email protected]>
Commit: John-Mark Bell <[email protected]>
about(chart): include config.h to silence warning
This file uses strndup, so needs config.h including to define it.
diff --git a/content/fetchers/about/chart.c b/content/fetchers/about/chart.c
index 8dae445..c030c12 100644
--- a/content/fetchers/about/chart.c
+++ b/content/fetchers/about/chart.c
@@ -35,6 +35,7 @@
#include "utils/config.h"
#include "netsurf/inttypes.h"
+#include "utils/config.h"
#include "utils/utils.h"
#include "utils/errors.h"
#include "utils/nsurl.h"
-----------------------------------------------------------------------
Summary of changes:
content/fetchers/about/chart.c | 1 +
desktop/browser_window.c | 1 +
desktop/save_complete.c | 4 ++--
frontends/riscos/gui.c | 18 ++++++++++--------
frontends/riscos/print.c | 6 +++---
5 files changed, 17 insertions(+), 13 deletions(-)
diff --git a/content/fetchers/about/chart.c b/content/fetchers/about/chart.c
index 8dae445..c030c12 100644
--- a/content/fetchers/about/chart.c
+++ b/content/fetchers/about/chart.c
@@ -35,6 +35,7 @@
#include "utils/config.h"
#include "netsurf/inttypes.h"
+#include "utils/config.h"
#include "utils/utils.h"
#include "utils/errors.h"
#include "utils/nsurl.h"
diff --git a/desktop/browser_window.c b/desktop/browser_window.c
index 38ae774..c70db7c 100644
--- a/desktop/browser_window.c
+++ b/desktop/browser_window.c
@@ -62,6 +62,7 @@
#include "desktop/hotlist.h"
#include "desktop/knockout.h"
#include "desktop/browser_history.h"
+#include "desktop/theme.h"
#ifdef WITH_THEME_INSTALL
#include "desktop/theme.h"
diff --git a/desktop/save_complete.c b/desktop/save_complete.c
index 24c1881..e4fadd2 100644
--- a/desktop/save_complete.c
+++ b/desktop/save_complete.c
@@ -51,7 +51,7 @@
#include "desktop/gui_internal.h"
#include "desktop/save_complete.h"
-regex_t save_complete_import_re;
+static regex_t save_complete_import_re;
/** An entry in save_complete_list. */
typedef struct save_complete_entry {
@@ -196,7 +196,7 @@ save_complete_save_buffer(save_complete_ctx *ctx,
* perform a posix regexec on a string without a null terminator
*/
static int
-snregexec(const regex_t *preg,
+snregexec(regex_t *preg,
const char *string,
size_t stringlen,
size_t nmatch,
diff --git a/frontends/riscos/gui.c b/frontends/riscos/gui.c
index f9268ca..6b8f1a5 100644
--- a/frontends/riscos/gui.c
+++ b/frontends/riscos/gui.c
@@ -1231,16 +1231,9 @@ static nserror gui_init(int argc, char** argv)
/* Initialise save complete functionality */
save_complete_init();
- /* Initialise the font subsystem */
- nsfont_init();
-
- /* Load in visited URLs, Cookies, and hostlist */
+ /* Load in visited URLs and Cookies */
urldb_load(nsoption_charp(url_path));
urldb_load_cookies(nsoption_charp(cookie_file));
- hotlist_init(nsoption_charp(hotlist_path),
- nsoption_bool(external_hotlists) ?
- NULL :
- nsoption_charp(hotlist_save));
/* Initialise with the wimp */
error = xwimp_initialise(wimp_VERSION_RO38, task_name,
@@ -1271,6 +1264,15 @@ static nserror gui_init(int argc, char** argv)
ro_message_register_route(message_WINDOW_INFO,
ro_msg_window_info);
+ /* Initialise the font subsystem (must be after Wimp_Initialise) */
+ nsfont_init();
+
+ /* Initialise the hotlist (must be after fonts) */
+ hotlist_init(nsoption_charp(hotlist_path),
+ nsoption_bool(external_hotlists) ?
+ NULL :
+ nsoption_charp(hotlist_save));
+
/* Initialise global information */
ro_gui_get_screen_properties();
ro_gui_wimp_get_desktop_font();
diff --git a/frontends/riscos/print.c b/frontends/riscos/print.c
index b390c69..e87f478 100644
--- a/frontends/riscos/print.c
+++ b/frontends/riscos/print.c
@@ -106,7 +106,7 @@ static bool print_document(struct gui_window *g, const char
*filename);
static const char *print_declare_fonts(struct hlcache_handle *h);
static void print_fonts_callback(void *context,
const char *font_name, unsigned int font_size,
- const char *s8, unsigned short *s16, unsigned int n,
+ const uint8_t *s8, const uint32_t *s32, unsigned int n,
int x, int y);
@@ -998,7 +998,7 @@ end:
void print_fonts_callback(void *context,
const char *font_name, unsigned int font_size,
- const char *s8, unsigned short *s16, unsigned int n,
+ const uint8_t *s8, const uint32_t *s32, unsigned int n,
int x, int y)
{
unsigned int i;
@@ -1009,7 +1009,7 @@ void print_fonts_callback(void *context,
(void) x; /* unused */
(void) y; /* unused */
- assert(s8 || s16);
+ assert(s8 || s32);
/* check if the font name is new */
for (i = 0; i != print_fonts_count &&
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list -- [email protected]
To unsubscribe send an email to [email protected]
