* Compile out enable_inline_img ifndef USE_IMAGE

* Make auto-selection a true option for inline_img_protocol, with a
  separate variable for configuration

Author: el-remph

display.c

@@ -530,12 +530,14 @@ drawAnchorCursor0(Buffer *buf, AnchorList *al, int hseq, int prevhseq,
 	    int start_pos = an->start.pos;
 	    int end_pos = an->end.pos;
 	    for (i = an->start.pos; i < an->end.pos; i++) {
-	        if (enable_inline_image && (l->propBuf[i] & PE_IMAGE)) {
+#ifdef USE_IMAGE
+		if (enable_inline_image && (l->propBuf[i] & PE_IMAGE)) {
 		    if (start_pos == i)
 			start_pos = i + 1;
 		    else if (end_pos == an->end.pos)
 		        end_pos = i - 1;
 		}
+#endif
 		if (l->propBuf[i] & (PE_IMAGE | PE_ANCHOR | PE_FORM)) {
 		    if (active)
 			l->propBuf[i] |= PE_ACTIVE;

fm.h

@@ -317,11 +317,14 @@ extern int REV_LB[];
 #define EOL(l) (&(l)->ptr[(l)->length])
 #define IS_EOL(p,l) ((p)==&(l)->ptr[(l)->length])
 
+#ifdef USE_IMAGE
+#define INLINE_IMG_AUTO		-1
 #define INLINE_IMG_NONE		0
 #define INLINE_IMG_OSC5379	1
 #define INLINE_IMG_SIXEL	2
 #define INLINE_IMG_ITERM2	3
 #define INLINE_IMG_KITTY	4
+#endif
 
 /* 
  * Types.
@@ -940,7 +943,10 @@ global char *CurrentKeyData;
 global char *CurrentCmdData;
 global char *w3m_reqlog;
 extern char *w3m_version;
-extern signed char enable_inline_image;
+#ifdef USE_IMAGE
+global unsigned char enable_inline_image init(INLINE_IMG_NONE);
+global signed char enable_inline_image_config init(INLINE_IMG_AUTO);
+#endif
 
 #define DUMP_BUFFER   0x01
 #define DUMP_HEAD     0x02

image.c

@@ -44,11 +44,9 @@ static int inline_img_protocol_autodetect(void);
 void
 initImage()
 {
-    /* This must be checked first and always, since the rest of this module
-     * tests this variable as a boolean, so will get a likely false
-     * positive */
-    if (enable_inline_image == -1)
-	enable_inline_image = inline_img_protocol_autodetect();
+    enable_inline_image = enable_inline_image_config == INLINE_IMG_AUTO
+	    ? inline_img_protocol_autodetect()
+	    : enable_inline_image_config;
 
     if (activeImage)
 	return;
@@ -178,11 +176,11 @@ have_img2sixel(void)
     int wstatus;
 
     if (getenv("W3M_IMG2SIXEL"))
-	return 1;
+	return TRUE;
 
     switch (child_pid = fork()) {
     case -1:
-	return 0;
+	return FALSE;
     case 0:
 	close(STDOUT_FILENO);
 	close(STDERR_FILENO);

main.c

@@ -127,8 +127,6 @@ static int searchKeyNum(void);
 #define help() fusage(stdout, 0)
 #define usage() fusage(stderr, 1)
 
-signed char enable_inline_image = -1;
-
 static void
 fversion(FILE * f)
 {
@@ -719,13 +717,13 @@ main(int argc, char **argv)
 		    set_pixel_per_line = TRUE;
 		}
 	    }
-#endif
 	    else if (!strcmp("-ri", argv[i])) {
 	        enable_inline_image = INLINE_IMG_OSC5379;
 	    }
 	    else if (!strcmp("-sixel", argv[i])) {
 		enable_inline_image = INLINE_IMG_SIXEL;
 	    }
+#endif
 	    else if (!strcmp("-num", argv[i]))
 		showLineNum = TRUE;
 	    else if (!strcmp("-no-proxy", argv[i]))
@@ -6006,11 +6004,13 @@ deleteFiles()
     }
     while ((f = popText(fileToDelete)) != NULL) {
 	unlink(f);
+#ifdef USE_IMAGE
 	if (enable_inline_image == INLINE_IMG_SIXEL && strcmp(f+strlen(f)-4, ".gif") == 0) {
 	    Str firstframe = Strnew_charp(f);
 	    Strcat_charp(firstframe, "-1");
 	    unlink(firstframe->ptr);
         }
+#endif
     }
 }
 

rc.c

@@ -377,6 +377,7 @@ static struct sel_c graphic_char_str[] = {
 
 #ifdef USE_IMAGE
 static struct sel_c inlineimgstr[] = {
+    {N_S(INLINE_IMG_AUTO), N_("auto-select protocol")},
     {N_S(INLINE_IMG_NONE), N_("external command")},
     {N_S(INLINE_IMG_OSC5379), N_("OSC 5379 (mlterm)")},
     {N_S(INLINE_IMG_SIXEL), N_("sixel (img2sixel)")},
@@ -449,7 +450,7 @@ struct param_ptr params1[] = {
      CMT_EXT_IMAGE_VIEWER, NULL},
     {"image_scale", P_SCALE, PI_TEXT, (void *)&image_scale, CMT_IMAGE_SCALE,
      NULL},
-    {"inline_img_protocol", P_CHARINT, PI_SEL_C, (void *)&enable_inline_image,
+    {"inline_img_protocol", P_CHARINT, PI_SEL_C, (void *)&enable_inline_image_config,
      CMT_INLINE_IMG_PROTOCOL, (void *)inlineimgstr},
     {"imgdisplay", P_STRING, PI_TEXT, (void *)&Imgdisplay, CMT_IMGDISPLAY,
      NULL},
@@ -1313,7 +1314,7 @@ sync_with_option(void)
     init_migemo();
 #endif
 #ifdef USE_IMAGE
-    if (fmInitialized && (displayImage || enable_inline_image))
+    if (fmInitialized && (displayImage || enable_inline_image_config))
 	initImage();
 #else
     displayImage = FALSE;	/* XXX */