Branch apps as mupdf.

Previously the example front end applications were called generically
'pdfview' and 'pdftool'. In preparation for release we'd like to brand
them more uniquely. Since the user-facing part of the tree is the mupdf
library, we intend to brand the releases mupdf.

In support of this, 'pdfview' becomes 'mupdf' and 'pdftool' becomes
'mupdftool'.

4 files changed, 21 insertions, 17 deletions

diff --git a/apps/Jamfile b/apps/Jamfile
index e8a9f333..e6a72bfd 100644
--- a/apps/Jamfile
+++ b/apps/Jamfile
@@ -3,8 +3,8 @@
 FITZLIBS = libmupdf libbase libstream libworld libraster libfonts ;
 
 SubDir TOP apps ;
-Main pdftool : pdftool.c ;
-LinkLibraries pdftool : $(FITZLIBS) ;
+Main mupdftool : pdftool.c ;
+LinkLibraries mupdftool : $(FITZLIBS) ;
 
 SubDir TOP apps common ;
 Library libpdfapp : pdfapp.c ;
@@ -12,17 +12,17 @@ Library libpdfapp : pdfapp.c ;
 if $(BUILD_WINAPP)
 {
     SubDir TOP apps windows ;
-    Main pdfview : winmain.c winres.rc ;
-    LinkLibraries pdfview : libpdfapp $(FITZLIBS) ;
-    LINKLIBS on pdfview$(SUFEXE) = $(LINKLIBS) $(APPLINKLIBS) ;
+    Main mupdf : winmain.c winres.rc ;
+    LinkLibraries mupdf : libpdfapp $(FITZLIBS) ;
+    LINKLIBS on mupdf$(SUFEXE) = $(LINKLIBS) $(APPLINKLIBS) ;
 }
 
 if $(BUILD_X11APP)
 {
     SubDir TOP apps unix ;
-    Main pdfview : x11pdf.c ximage.c ;
-    LinkLibraries pdfview : libpdfapp $(FITZLIBS) ;
-    LINKLIBS on pdfview$(SUFEXE) = $(LINKLIBS) $(APPLINKLIBS) ;
+    Main mupdf : x11pdf.c ximage.c ;
+    LinkLibraries mupdf : libpdfapp $(FITZLIBS) ;
+    LINKLIBS on mupdf$(SUFEXE) = $(LINKLIBS) $(APPLINKLIBS) ;
 }
 
 if $(BUILD_PLUGIN)
diff --git a/apps/pdftool.c b/apps/pdftool.c
index 8cf2b8e3..fbd26024 100644
--- a/apps/pdftool.c
+++ b/apps/pdftool.c
@@ -165,7 +165,7 @@ int showcolumn;
 
 void showusage(void)
 {
-	fprintf(stderr, "usage: pdftool show [-bd] <file> [xref] [trailer] [object numbers]\n");
+	fprintf(stderr, "usage: mupdftool show [-bd] <file> [xref] [trailer] [object numbers]\n");
 	fprintf(stderr, "  -b  \tprint streams as raw binary data\n");
 	fprintf(stderr, "  -d  \tdecode streams\n");
 	exit(1);
@@ -321,7 +321,7 @@ void
 cleanusage(void)
 {
 	fprintf(stderr,
-			"usage: pdftool clean [options] input.pdf [outfile.pdf]\n"
+			"usage: mupdftool clean [options] input.pdf [outfile.pdf]\n"
 			"  -d -\tpassword for decryption\n"
 			"  -g  \tgarbage collect unused objects\n"
 			"  -x  \texpand compressed streams\n"
@@ -497,7 +497,7 @@ void
 drawusage(void)
 {
 	fprintf(stderr,
-			"usage: pdftool draw [options] [file.pdf pages ... ]\n"
+			"usage: mupdftool draw [options] [file.pdf pages ... ]\n"
 			"  -b -\tdraw page in N bands\n"
 			"  -d -\tpassword for decryption\n"
 			"  -o -\tpattern (%%d for page number) for output file\n"
@@ -506,7 +506,7 @@ drawusage(void)
 			"  -x  \txml dump of display tree\n"
 			"  -m  \tprint benchmark results\n"
 			"  example:\n"
-			"    pdftool draw -o out%%03d.pnm a.pdf 1-3,5,9-\n");
+			"    mupdftool draw -o out%%03d.pnm a.pdf 1-3,5,9-\n");
 	exit(1);
 }
 
@@ -879,11 +879,11 @@ int editmode = COPY;
 void
 editusage(void)
 {
-	fprintf(stderr, "usage: pdftool edit [-o file.pdf] [mode file.pdf pages ... ]\n");
+	fprintf(stderr, "usage: mupdftool edit [-o file.pdf] [mode file.pdf pages ... ]\n");
 	fprintf(stderr, "  mode is one of: copy over 2up 4up 8up\n");
 	fprintf(stderr, "  pages is a comma separated list of ranges\n");
 	fprintf(stderr, "  example:\n");
-	fprintf(stderr, "    pdftool edit -o output.pdf copy one.pdf 1-3,5,9 two.pdf 1-\n");
+	fprintf(stderr, "    mupdftool edit -o output.pdf copy one.pdf 1-3,5,9 two.pdf 1-\n");
 	exit(1);
 }
 
@@ -1157,7 +1157,7 @@ editmain(int argc, char **argv)
 void
 mainusage(void)
 {
-	fprintf(stderr, "usage: pdftool <command> [options...]\n");
+	fprintf(stderr, "usage: mupdftool <command> [options...]\n");
 	fprintf(stderr, "  command is one of: show, draw, clean, edit\n");
 	exit(1);
 }
diff --git a/apps/unix/x11pdf.c b/apps/unix/x11pdf.c
index e7699620..0b1ff37c 100644
--- a/apps/unix/x11pdf.c
+++ b/apps/unix/x11pdf.c
@@ -79,7 +79,7 @@ static pdfapp_t gapp;
 
 void winwarn(pdfapp_t *app, char *msg)
 {
-	fprintf(stderr, "pdfview: %s\n", msg);
+	fprintf(stderr, "mupdf: %s\n", msg);
 }
 
 void winerror(pdfapp_t *app, fz_error *error)
@@ -457,7 +457,7 @@ void onmouse(int x, int y, int btn, int modifiers, int state)
 
 void usage(void)
 {
-	fprintf(stderr, "usage: pdfview [-d password] [-z zoom] [-p pagenumber] file.pdf\n");
+	fprintf(stderr, "usage: mupdf [-d password] [-z zoom] [-p pagenumber] file.pdf\n");
 	exit(1);
 }
 
diff --git a/apps/unix/ximage.c b/apps/unix/ximage.c
index ed2ce9c0..f1429e62 100644
--- a/apps/unix/ximage.c
+++ b/apps/unix/ximage.c
@@ -6,6 +6,10 @@
 # define _XOPEN_SOURCE 1
 #endif
 
+#ifndef _XOPEN_SOURCE
+# define _XOPEN_SOURCE 1
+#endif
+
 #include <fitz.h>
 
 #include <X11/Xlib.h>