summaryrefslogtreecommitdiff
path: root/src/HTInit.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/HTInit.c')
-rw-r--r--src/HTInit.c41
1 files changed, 22 insertions, 19 deletions
diff --git a/src/HTInit.c b/src/HTInit.c
index 617c303..ba128e4 100644
--- a/src/HTInit.c
+++ b/src/HTInit.c
@@ -63,24 +63,28 @@ void HTFormatInit(void)
SET_PRESENT("audio/basic", "open %s", 1.0, 2.0);
SET_PRESENT("*", "open %s", 1.0, 0.0);
#else
- if (LYgetXDisplay() != 0) {
-
- /* SET_PRESENT("application/postscript", "ghostview %s&", 1.0, 3.0); */
- if (non_empty(XLoadImageCommand)) {
- /*
- SET_PRESENT("image/gif", XLoadImageCommand, 1.0, 3.0);
- SET_PRESENT("image/x-xbm", XLoadImageCommand, 1.0, 3.0);
- SET_PRESENT("image/x-xbitmap", XLoadImageCommand, 1.0, 3.0);
- SET_PRESENT("image/x-png", XLoadImageCommand, 2.0, 3.0);
- SET_PRESENT("image/png", XLoadImageCommand, 1.0, 3.0);
- SET_PRESENT("image/x-rgb", XLoadImageCommand, 1.0, 3.0);
- SET_PRESENT("image/x-tiff", XLoadImageCommand, 2.0, 3.0);
- SET_PRESENT("image/tiff", XLoadImageCommand, 1.0, 3.0);
- SET_PRESENT("image/jpeg", XLoadImageCommand, 1.0, 3.0);
- */
- }
-
- /* SET_PRESENT("video/mpeg", "mpeg_play %s &", 1.0, 3.0); */
+ if (LYgetXDisplay() != 0) { /* Must have X11 */
+ /*
+ SET_PRESENT("application/postscript", "ghostview %s&", 1.0, 3.0);
+ */
+ if (non_empty(XLoadImageCommand)) {
+ /* *INDENT-OFF* */
+ /*
+ SET_PRESENT("image/gif", XLoadImageCommand, 1.0, 3.0);
+ SET_PRESENT("image/x-xbm", XLoadImageCommand, 1.0, 3.0);
+ SET_PRESENT("image/x-xbitmap", XLoadImageCommand, 1.0, 3.0);
+ SET_PRESENT("image/x-png", XLoadImageCommand, 2.0, 3.0);
+ SET_PRESENT("image/png", XLoadImageCommand, 1.0, 3.0);
+ SET_PRESENT("image/x-rgb", XLoadImageCommand, 1.0, 3.0);
+ SET_PRESENT("image/x-tiff", XLoadImageCommand, 2.0, 3.0);
+ SET_PRESENT("image/tiff", XLoadImageCommand, 1.0, 3.0);
+ SET_PRESENT("image/jpeg", XLoadImageCommand, 1.0, 3.0);
+ */
+ /* *INDENT-ON* */
+ }
+ /*
+ SET_PRESENT("video/mpeg", "mpeg_play %s &", 1.0, 3.0);
+ */
}
#endif
@@ -102,7 +106,6 @@ void HTFormatInit(void)
SET_INTERNL("message/x-http-redirection", STR_PRESENT, HTMIMERedirect, 2.0);
SET_INTERNL("message/x-http-redirection", "www/debug", HTMIMERedirect, 1.0);
SET_INTERNL("www/mime", STR_PRESENT, HTMIMEConvert, 1.0);
- SET_INTERNL("www/mime", STR_PRESENT, HTMIMEConvert, 1.0);
SET_INTERNL("www/mime", STR_DOWNLOAD, HTMIMEConvert, 1.0);
SET_INTERNL("www/mime", STR_SOURCE, HTMIMEConvert, 1.0);
SET_INTERNL("www/mime", STR_DUMP, HTMIMEConvert, 1.0);