Introduce a general output context.

This makes it possible to redirect standard out and standard error output streams to output streams of your liking. This means that now you can, in gdb, type: (gdb) call pdf_print_obj(ctx, fz_stdout(ctx), obj, 0) (gdb) call fflush(0) or when dealing with an unresolved indirect reference: (gdb) call pdf_print_obj(ctx, fz_stdout(ctx), pdf_resolve_indirect(ctx, ref), 0) (gdb) call fflush(0)
author: Sebastian Rasmussen <sebras@gmail.com> 2016-04-19 16:54:52 +0200
committer: Tor Andersson <tor.andersson@artifex.com> 2016-05-13 11:42:00 +0200
commit: b994d72069d761c8645cc6a0638bde21109c0b40 (patch)
tree: 2d95cbdb501d81b49210d6c115b51bb5fa9c62a7 /source
parent: e67981e781fd087d7cd19e2373b3e054375e82ad (diff)
download: mupdf-b994d72069d761c8645cc6a0638bde21109c0b40.tar.xz
6 files changed, 101 insertions, 7 deletions
diff --git a/source/fitz/context.c b/source/fitz/context.c
index bfc7a1cd..9a533cff 100644
--- a/source/fitz/context.c
+++ b/source/fitz/context.c
@@ -132,6 +132,7 @@ fz_drop_context(fz_context *ctx)
 	fz_drop_colorspace_context(ctx);
 	fz_drop_font_context(ctx);
 	fz_drop_id_context(ctx);
+	fz_drop_output_context(ctx);
 
 	if (ctx->warn)
 	{
@@ -222,6 +223,7 @@ fz_new_context_imp(const fz_alloc_context *alloc, const fz_locks_context *locks,
 	/* Now initialise sections that are shared */
 	fz_try(ctx)
 	{
+		fz_new_output_context(ctx);
 		fz_new_store_context(ctx, max_store);
 		fz_new_glyph_cache_context(ctx);
 		fz_new_colorspace_context(ctx);
@@ -266,6 +268,8 @@ fz_clone_context_internal(fz_context *ctx)
 	fz_copy_aa_context(new_ctx, ctx);
 
 	/* Keep thread lock checking happy by copying pointers first and locking under new context */
+	new_ctx->output = ctx->output;
+	new_ctx->output = fz_keep_output_context(new_ctx);
 	new_ctx->user = ctx->user;
 	new_ctx->store = ctx->store;
 	new_ctx->store = fz_keep_store_context(new_ctx);
diff --git a/source/fitz/output.c b/source/fitz/output.c
index 9ea2d169..07422955 100644
--- a/source/fitz/output.c
+++ b/source/fitz/output.c
@@ -1,5 +1,87 @@
 #include "mupdf/fitz.h"
 
+struct fz_output_context_s
+{
+	int refs;
+	fz_output *out;
+	fz_output *err;
+};
+
+static void std_write(fz_context *ctx, void *opaque, const void *buffer, int count);
+
+static fz_output fz_stdout_global = {
+	&fz_stdout_global,
+	std_write,
+	NULL,
+	NULL,
+	NULL,
+};
+
+static fz_output fz_stderr_global = {
+	&fz_stderr_global,
+	std_write,
+	NULL,
+	NULL,
+	NULL,
+};
+
+void
+fz_new_output_context(fz_context *ctx)
+{
+	ctx->output = fz_malloc_struct(ctx, fz_output_context);
+	ctx->output->refs = 1;
+	ctx->output->out = &fz_stdout_global;
+	ctx->output->err = &fz_stderr_global;
+}
+
+fz_output_context *
+fz_keep_output_context(fz_context *ctx)
+{
+	if (!ctx)
+		return NULL;
+	return fz_keep_imp(ctx, ctx->output, &ctx->output->refs);
+}
+
+void
+fz_drop_output_context(fz_context *ctx)
+{
+	if (!ctx || !ctx->output)
+		return;
+
+	if (fz_drop_imp(ctx, ctx->output, &ctx->output->refs))
+	{
+		/* FIXME: should we flush here? closing the streams seems wrong */
+		fz_free(ctx, ctx->output);
+		ctx->output = NULL;
+	}
+}
+
+void
+fz_set_stdout(fz_context *ctx, fz_output *out)
+{
+	fz_drop_output(ctx, ctx->output->out);
+	ctx->output->out = out ? out : &fz_stdout_global;
+}
+
+void
+fz_set_stderr(fz_context *ctx, fz_output *err)
+{
+	fz_drop_output(ctx, ctx->output->err);
+	ctx->output->err = err ? err : &fz_stderr_global;
+}
+
+fz_output *
+fz_stdout(fz_context *ctx)
+{
+	return ctx->output->out;
+}
+
+fz_output *
+fz_stderr(fz_context *ctx)
+{
+	return ctx->output->err;
+}
+
 static void
 file_write(fz_context *ctx, void *opaque, const void *buffer, int count)
 {
@@ -23,6 +105,13 @@ file_write(fz_context *ctx, void *opaque, const void *buffer, int count)
 }
 
 static void
+std_write(fz_context *ctx, void *opaque, const void *buffer, int count)
+{
+	FILE *f = opaque == &fz_stdout_global ? stdout : opaque == &fz_stderr_global ? stderr : NULL;
+	file_write(ctx, f, buffer, count);
+}
+
+static void
 file_seek(fz_context *ctx, void *opaque, fz_off_t off, int whence)
 {
 	FILE *file = opaque;
@@ -132,7 +221,8 @@ fz_drop_output(fz_context *ctx, fz_output *out)
 	if (!out) return;
 	if (out->close)
 		out->close(ctx, out->opaque);
-	fz_free(ctx, out);
+	if (out->opaque != &fz_stdout_global && out->opaque != &fz_stderr_global)
+		fz_free(ctx, out);
 }
 
 void
diff --git a/source/tools/mudraw.c b/source/tools/mudraw.c
index 2717b5f0..6523380b 100644
--- a/source/tools/mudraw.c
+++ b/source/tools/mudraw.c
@@ -698,7 +698,7 @@ static void dodrawpage(fz_context *ctx, fz_page *page, fz_display_list *list, in
 		fz_output *out;
 
 		if (!strcmp(output, "-"))
-			out = fz_new_output_with_file_ptr(ctx, stdout, 0);
+			out = fz_stdout(ctx);
 		else
 		{
 			sprintf(buf, output, pagenum);
@@ -1606,7 +1606,7 @@ int mudraw_main(int argc, char **argv)
 			out = fz_new_output_with_path(ctx, output, 0);
 	}
 	else
-		out = fz_new_output_with_file_ptr(ctx, stdout, 0);
+		out = fz_stdout(ctx);
 
 	timing.count = 0;
 	timing.total = 0;
diff --git a/source/tools/pdfinfo.c b/source/tools/pdfinfo.c
index da500f04..0d30b22a 100644
--- a/source/tools/pdfinfo.c
+++ b/source/tools/pdfinfo.c
@@ -1073,7 +1073,7 @@ int pdfinfo_main(int argc, char **argv)
 	ret = 0;
 	fz_try(ctx)
 	{
-		out = fz_new_output_with_file_ptr(ctx, stdout, 0);
+		out = fz_stdout(ctx);
 		pdfinfo_info(ctx, out, filename, password, show, &argv[fz_optind], argc-fz_optind);
 	}
 	fz_catch(ctx)
diff --git a/source/tools/pdfpages.c b/source/tools/pdfpages.c
index f13b5541..7f3577da 100644
--- a/source/tools/pdfpages.c
+++ b/source/tools/pdfpages.c
@@ -241,7 +241,7 @@ int pdfpages_main(int argc, char **argv)
 	ret = 0;
 	fz_try(ctx)
 	{
-		out = fz_new_output_with_file_ptr(ctx, stdout, 0);
+		out = fz_stdout(ctx);
 		ret = pdfpages_pages(ctx, out, filename, password, &argv[fz_optind], argc-fz_optind);
 	}
 	fz_catch(ctx)
diff --git a/source/tools/pdfshow.c b/source/tools/pdfshow.c
index 98a374b1..988663a4 100644
--- a/source/tools/pdfshow.c
+++ b/source/tools/pdfshow.c
@@ -197,7 +197,7 @@ static void showoutline(void)
 	fz_var(out);
 	fz_try(ctx)
 	{
-		out = fz_new_output_with_file_ptr(ctx, stdout, 0);
+		out = fz_stdout(ctx);
 		fz_print_outline(ctx, out, outline);
 	}
 	fz_always(ctx)
@@ -245,7 +245,7 @@ int pdfshow_main(int argc, char **argv)
 	if (output)
 		out = fz_new_output_with_path(ctx, output, 0);
 	else
-		out = fz_new_output_with_file_ptr(ctx, stdout, 0);
+		out = fz_stdout(ctx);
 
 	fz_var(doc);
 	fz_try(ctx)
author	Sebastian Rasmussen <sebras@gmail.com>	2016-04-19 16:54:52 +0200
committer	Tor Andersson <tor.andersson@artifex.com>	2016-05-13 11:42:00 +0200
commit	b994d72069d761c8645cc6a0638bde21109c0b40 (patch)
tree	2d95cbdb501d81b49210d6c115b51bb5fa9c62a7 /source
parent	e67981e781fd087d7cd19e2373b3e054375e82ad (diff)
download	mupdf-b994d72069d761c8645cc6a0638bde21109c0b40.tar.xz