mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2024-12-22 12:12:35 +03:00
Code Issues Packages Projects Releases Wiki Activity

Use consoleFormatter in Console.bnd

Browse Source 
Signed-off-by: Daniel Silverstone <dsilvers@digital-scurf.org>
This commit is contained in:
Daniel Silverstone 2019-05-05 22:16:35 +01:00
parent 846e811760
commit 67da94a537
1 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
content/handlers/javascript/duktape/Console.bnd
View File

@ -13,28 +13,49 @@ class Console {
private unsigned int group; private unsigned int group;
prologue %{ prologue %{
#include <nsutils/time.h> #include <nsutils/time.h>
#include "netsurf/browser_window.h"
#define CONSOLE_TIMERS MAGIC(ConsoleTimers) #define CONSOLE_TIMERS MAGIC(ConsoleTimers)
static void static void
write_log_entry(duk_context *ctx, unsigned int group, char logtype) write_log_entry(duk_context *ctx, unsigned int group, browser_window_console_flags flags)
{ {
/* objs... */ /* objs... */
dukky_push_generics(ctx, "consoleFormatter");
duk_insert(ctx, 0);
if (dukky_pcall(ctx, duk_get_top(ctx) - 1, false)) {
/* Failed to convert somehow, oh dear, you get to keep
* all the pieces.
*/
duk_pop(ctx);
duk_push_string(ctx, "Oh dear, formatter went banananas");
}
/* str?objs?... */
for (int i = 0; i < duk_get_top(ctx); ++i) { for (int i = 0; i < duk_get_top(ctx); ++i) {
(void)duk_safe_to_string(ctx, i); (void)duk_safe_to_string(ctx, i);
} }
/* strs... */ /* strs... */
duk_push_sprintf(ctx, "%c: ", logtype);
duk_insert(ctx, 0);
/* pfx strs... */
for (unsigned int u = 0; u < group; ++u) { for (unsigned int u = 0; u < group; ++u) {
duk_push_lstring(ctx, " ", 1); duk_push_lstring(ctx, " ", 1);
duk_insert(ctx, 0); duk_insert(ctx, 0);
} }
/* spcs... pfx strs... */ /* spcs... strs... */
duk_concat(ctx, duk_get_top(ctx)); duk_concat(ctx, duk_get_top(ctx));
/* str */ /* str */
NSLOG(netsurf, INFO, "%s", duk_safe_to_string(ctx, 0));
duk_push_global_object(ctx);
duk_get_prop_string(ctx, -1, PRIVATE_MAGIC);
window_private_t *priv_win = duk_get_pointer(ctx, -1);
duk_pop(ctx);
duk_size_t msglen;
const char *msg = duk_safe_to_lstring(ctx, 0, &msglen);
if (browser_window_console_log(priv_win->win, BW_CS_SCRIPT_CONSOLE,
msg, msglen,
flags) != NSERROR_OK) {
NSLOG(netsurf, DEBUG, "Unable to log: %s", duk_safe_to_string(ctx, 0));
}
} }
%}; %};