storm/w3m
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* [w3m-dev 04321] Re: w3m's bugs from bugs.debian.org

Browse Source 
* http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=329863#8
* rc.c: Introduce option pseudo_inlines.
* fm.h: add global variable pseudoInlines.
* file.c (process_img): check q.
This commit is contained in:
Ito Hiroyuki
2010-07-19 12:53:39 +00:00
parent 3b6bf23b5a
commit cc5f95be50
4 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog
+9 -1
View File
@@ -1,3 +1,11 @@
2010-07-19 d+w3m@vdr.jp
* [w3m-dev 04321] Re: w3m's bugs from bugs.debian.org
* http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=329863#8
* rc.c: Introduce option pseudo_inlines.
* fm.h: add global variable pseudoInlines.
* file.c (process_img): check q.
2010-07-19 d+w3m@vdr.jp 2010-07-19 d+w3m@vdr.jp
* [w3m-dev 04321] Re: w3m's bugs from bugs.debian.org * [w3m-dev 04321] Re: w3m's bugs from bugs.debian.org
@@ -9011,4 +9019,4 @@ a * [w3m-dev 03276] compile error on EWS4800
* release-0-2-1 * release-0-2-1
* import w3m-0.2.1 * import w3m-0.2.1
$Id: ChangeLog,v 1.1013 2010/07/19 12:25:53 htrb Exp $ $Id: ChangeLog,v 1.1014 2010/07/19 12:53:39 htrb Exp $
file.c
+8 -1
View File
@@ -1,4 +1,4 @@
/* $Id: file.c,v 1.257 2010/07/19 11:45:24 htrb Exp $ */ /* $Id: file.c,v 1.258 2010/07/19 12:53:39 htrb Exp $ */
#include "fm.h" #include "fm.h"
#include <sys/types.h> #include <sys/types.h>
#include "myctype.h" #include "myctype.h"
@@ -3224,6 +3224,13 @@ process_img(struct parsed_tag *tag, int width)
parsedtag_get_value(tag, ATTR_ALT, &q); parsedtag_get_value(tag, ATTR_ALT, &q);
t = q; t = q;
parsedtag_get_value(tag, ATTR_TITLE, &t); parsedtag_get_value(tag, ATTR_TITLE, &t);
if (q == NULL || (*q == '\0' && ignore_null_img_alt)) {
if (!pseudoInlines && (t == NULL ||
(*t == '\0' && ignore_null_img_alt)))
return tmp;
q = t;
}
w = -1; w = -1;
if (parsedtag_get_value(tag, ATTR_WIDTH, &w)) { if (parsedtag_get_value(tag, ATTR_WIDTH, &w)) {
if (w < 0) { if (w < 0) {
fm.h
+2 -1
View File
@@ -1,4 +1,4 @@
/* $Id: fm.h,v 1.141 2010/07/19 12:08:41 htrb Exp $ */ /* $Id: fm.h,v 1.142 2010/07/19 12:53:39 htrb Exp $ */
/* /*
* w3m: WWW wo Miru utility * w3m: WWW wo Miru utility
* *
@@ -948,6 +948,7 @@ global int image_map_list init(TRUE);
#else #else
global int displayImage init(FALSE); /* XXX: emacs-w3m use display_image=off */ global int displayImage init(FALSE); /* XXX: emacs-w3m use display_image=off */
#endif #endif
global int pseudoInlines init(TRUE);
global char *Editor init(DEF_EDITOR); global char *Editor init(DEF_EDITOR);
#ifdef USE_W3MMAILER #ifdef USE_W3MMAILER
global char *Mailer init(NULL); global char *Mailer init(NULL);
rc.c
+4 -1
View File
@@ -1,4 +1,4 @@
/* $Id: rc.c,v 1.110 2010/07/19 12:25:53 htrb Exp $ */ /* $Id: rc.c,v 1.111 2010/07/19 12:53:39 htrb Exp $ */
/* /*
* Initialization file etc. * Initialization file etc.
*/ */
@@ -75,6 +75,7 @@ static int OptionEncode = FALSE;
#define CMT_DECODE_URL N_("Display decoded URL") #define CMT_DECODE_URL N_("Display decoded URL")
#define CMT_DISPLINEINFO N_("Display current line number") #define CMT_DISPLINEINFO N_("Display current line number")
#define CMT_DISP_IMAGE N_("Display inline images") #define CMT_DISP_IMAGE N_("Display inline images")
#define CMT_PSEUDO_INLINES N_("Display pseudo-ALTs for inline images with no ALT or TITLE string")
#ifdef USE_IMAGE #ifdef USE_IMAGE
#define CMT_AUTO_IMAGE N_("Load inline images automatically") #define CMT_AUTO_IMAGE N_("Load inline images automatically")
#define CMT_MAX_LOAD_IMAGE N_("Maximum processes for parallel image loading") #define CMT_MAX_LOAD_IMAGE N_("Maximum processes for parallel image loading")
@@ -385,6 +386,8 @@ struct param_ptr params1[] = {
/* XXX: emacs-w3m force to off display_image even if image options off */ /* XXX: emacs-w3m force to off display_image even if image options off */
{"display_image", P_INT, PI_ONOFF, (void *)&displayImage, CMT_DISP_IMAGE, {"display_image", P_INT, PI_ONOFF, (void *)&displayImage, CMT_DISP_IMAGE,
NULL}, NULL},
{"pseudo_inlines", P_INT, PI_ONOFF, (void *)&pseudoInlines,
CMT_PSEUDO_INLINES, NULL},
#ifdef USE_IMAGE #ifdef USE_IMAGE
{"auto_image", P_INT, PI_ONOFF, (void *)&autoImage, CMT_AUTO_IMAGE, NULL}, {"auto_image", P_INT, PI_ONOFF, (void *)&autoImage, CMT_AUTO_IMAGE, NULL},
{"max_load_image", P_INT, PI_TEXT, (void *)&maxLoadImage, {"max_load_image", P_INT, PI_TEXT, (void *)&maxLoadImage,