* NEWS: w3m-img merge
* .cvsignore: add w3mimgdisplay, w3mimgsize
* XMakefile: add image.c to SRCS
	     add image.o to OBJS
             add IMGDISPLAY, IMGSIZE
* config.h.dist: USE_IMAGE, IMGSIZE, IMGDISPLAY
* configure: add find_imlib
		ask use_image
	(config.h) add $imgtarget to EXT_TARGETS
		   $def_use_image
		   IMGSIZE, IMGDISPLAY
* fm.h (MAX_IMAGE): added
* fm.h (DEFAULT_PIXEL_PER_CHAR): fix for USE_IMAGE
* fm.h (DEFAULT_PIXEL_PER_LINE): added
* fm.h (B_REDRAW_IMAGE): added
* fm.h (IMG_FLAG_SKIP): added
* fm.h (IMG_FLAG_AUTO): added
* fm.h (IMG_FLAG_START): added
* fm.h (IMG_FLAG_STOP): added
* fm.h (IMG_FLAG_NEXT): added
* fm.h (IMG_FLAG_UNLOADED): added
* fm.h (IMG_FLAG_LOADED): added
* fm.h (IMG_FLAG_ERROR): added
* fm.h (MapArea): added
* fm.h (MapList): s/urls/alts/, add area
* fm.h (ImageCache): added
* fm.h (Image): added
* fm.h (Anchor): add image
* fm.h (Buffer): add imarklist, image_flag, need_reshape
* fm.h (RG_FRAME_SRC): added
* fm.h (ALIGN_MIDDLE): added
* fm.h (ALIGN_TOP): added
* fm.h (ALIGN_BOTTOM): added
* fm.h (QuietMessage): added
* fm.h (Imgdisplay): added
* fm.h (Imgsize): added
* fm.h (activeImage): added
* fm.h (displayImage): added
* fm.h (autoImage): added
* fm.h (useExtImageViewer): added
* fm.h (image_source): added
* fm.h (view_unseenobject): change default if USE_IMAGE
* fm.h (set_pixel_per_char): added
* fm.h (pixel_per_line): added
* fm.h (set_pixel_per_line): added
* fm.h (image_scale): added
* proto.h (dispI): added
* proto.h (stopI): added
* proto.h (deleteImage): added
* proto.h (getAllImage): added
* proto.h (loadImage): added
* proto.h (getImage): added
* proto.h (getImageSize): added
* proto.h (process_img): add width arg
* proto.h (loadImageBuffer): added
* proto.h (follow_map_menu): add a_img arg
* proto.h (getMapXY): added
* proto.h (newMapArea): added
* proto.h (touch_cursor): added
* proto.h (cURLcode): added
* proto.h (initImage): added
* proto.h (termImage): added
* proto.h (addImage): added
* proto.h (drawImage): added
* proto.h (clearImage): added
* anchor.c (addMultirowsImg): added
* buffer.c (discardBuffer): deleteImage if USE_IMAGE
* buffer.c (reshapeBuffer): buf->need_reshape check
* display.c (fmTerm): if activeImage, stop load image
* display.c (fmInit): if displayImage, initImage
* display.c (image_touch): added
* display.c (draw_image_flag): added
* display.c (redrawLineImage): added
* display.c (displayBuffer): buf->need_reshape = TRUE
			mode == B_REDRAW_IMAGE
			image flag checks
			force redraw image in mode == B_REDRAW_IMAGE
			displayBuffer if need reshape
			drawImage
* display.c (redrawNLine): redrawLineImage
* display.c (redrawLineImage): added
* display.c (disp_message_nsec): return immediately if QuietMessage
* etc.c (reset_signals): ignore SIGUSR1
* file.c (frame_source): added
* file.c (_MoveFile): added
* file.c (cur_baseURL): added
* file.c (cur_document_code): added
* file.c (cur_iseq): added
* file.c (loadGeneralFile): fix fmInitialized and prevtrap checks
			save cur_baseURL
			image_source load
			loadImageBuffer for "image/*"
			frame_source flag
			fix b->type when proc is loadImageBuffer
* file.c (process_img): add width arg
		parse height and width attr, align
		fix for inline-image
* file.c (process_input): fix for form <input type="image">
* file.c (HTMLtagproc1): pass h_env->limit to process_img()
		fix <img_alt> for inline-image
		save cur_baseURL
* file.c (HTMLlineproc2body): fix <img_alt> for inline-image
* file.c (loadHTMLstream): fix for inline-image
		fix fmInitialized and prevtrap checks
		save cur_document_code
		save image_flag
* file.c (loadGopherDir): save cur_document_code
		fix fmInitialized and prevtrap checks
* file.c (loadImageBuffer): added for inline-image
* file.c (save2tmp): fix fmInitialized and prevtrap checks
* frame.c (frame_download_source): set RG_FRAME_SRC flag
		image check
* funcname.tab (DISPLAY_IMAGE): added
* funcname.tab (STOP_IMAGE): added
* html.c (ALST_IMG): add align, ismap
* html.c (ALST_AREA): add shape, coords
* html.c (ALST_IMG_ALT): add width, height, usemap, ismap, hseq,
			xoffset, yoffset, top_margin, bottom_margin
* html.c (AttrMap): add shape, coords, ismap, xoffset, yoffset
* html.h (ATTR_SHAPE): added
* html.h (ATTR_COORDS): added
* html.h (ATTR_ISMAP): added
* html.h (ATTR_XOFFSET): added
* html.h (ATTR_YOFFSET): added
* html.h (ATTR_TOP_MARGIN): added
* html.h (ATTR_BOTTOM_MARGIN): added
* html.h (SHAPE_UNKNOWN): added
* html.h (SHAPE_DEFAULT): added
* html.h (SHAPE_RECT): added
* html.h (SHAPE_CIRCLE): added
* html.h (SHAPE_POLY): added
* image.c: added
* main.c (fversion): add USE_IMAGE
* main.c (fusage): -ppl option
* main.c (MAIN): set_pixel_per_char if ppc specified
		-ppl option
		loadImage
* main.c (pushBuffer): deleteImage
* main.c (quitfm): termImage
* main.c (selBuf): deleteImage
* main.c (followA): fix for inline-image and map area
* main.c (query_from_followform): getMapXY()
* main.c (setOpt): displayBuffer B_REDRAW_IMAGE
* main.c (follow_map): fix calculate x, y
* main.c (dispI): added
* main.c (stopI): added
* map.c: include <math.h>
* map.c (inMapArea): added
* map.c (follow_map_menu): add a_img arg to handle inline-image
* map.c (follow_map_panel): use MapArea
* map.c (getMapXY): added
* map.c (newMapArea): added
* menu.c (smChBuf): deleteImage
* parsetagx.c (toAlign): align top, bottom, middle
* rc.c (P_SCALE): added
* rc.c (CMT_PIXEL_PER_LINE): added
* rc.c (CMT_DISP_IMAGE): added
* rc.c (CMT_AUTO_IMAGE): added
* rc.c (CMT_EXT_IMAGE_VIEWER): added
* rc.c (CMT_IMAGE_SCALE): added
* rc.c (CMT_IMGDISPLAY): added
* rc.c (CMT_IMGSIZE): added
* rc.c (show_param): P_PIXELS
* rc.c (set_param): P_PIXELS
* rc.c (sync_with_option): initImage
* rc.c (to_str): P_PIXELS
* table.c (feed_table_tag): fix <img> for inline-image
* tagtable.tab (image): added
* terms.c (wgetch): retry read when EINTR or EAGAIN
* terms.c (touch_cursor): added
* w3mimgdisplay.c: added
* w3mimgsize.c: added
* doc/README.func (DISPLAY_IMAGE): added
* doc/README.func (STOP_IMAGE): added
* doc/README.img: added
* doc-jp/README.func (DISPLAY_IMAGE): added
* doc-jp/README.func (STOP_IMAGE): added
* doc-jp/README.img: added
* scripts/w3mhelp.cgi.in: show dispI, stopI
* scripts/multipart/multipart.cgi.in: inline image support
From: Fumitoshi UKAI  <ukai@debian.or.jp>
		
	
		
			
				
	
	
		
			158 lines
		
	
	
		
			2.7 KiB
		
	
	
	
		
			SQL
		
	
	
	
	
	
			
		
		
	
	
			158 lines
		
	
	
		
			2.7 KiB
		
	
	
	
		
			SQL
		
	
	
	
	
	
| #include <stdio.h>
 | |
| #include "html.h"
 | |
| %%
 | |
| a		HTML_A
 | |
| /a		HTML_N_A
 | |
| _id		HTML_NOP
 | |
| hr		HTML_HR
 | |
| h1		HTML_H
 | |
| h2		HTML_H
 | |
| h3		HTML_H
 | |
| h4		HTML_H
 | |
| h5		HTML_H
 | |
| h6		HTML_H
 | |
| /h1		HTML_N_H
 | |
| /h2		HTML_N_H
 | |
| /h3		HTML_N_H
 | |
| /h4		HTML_N_H
 | |
| /h5		HTML_N_H
 | |
| /h6		HTML_N_H
 | |
| p		HTML_P
 | |
| br		HTML_BR
 | |
| b		HTML_B
 | |
| /b		HTML_N_B
 | |
| i		HTML_NOP
 | |
| /i		HTML_NOP
 | |
| tt		HTML_NOP
 | |
| /tt		HTML_NOP
 | |
| ul		HTML_UL
 | |
| /ul		HTML_N_UL
 | |
| menu		HTML_UL
 | |
| /menu		HTML_N_UL
 | |
| dir		HTML_UL
 | |
| /dir		HTML_N_UL
 | |
| li		HTML_LI
 | |
| ol		HTML_OL
 | |
| /ol		HTML_N_OL
 | |
| title		HTML_TITLE
 | |
| /title		HTML_N_TITLE
 | |
| dl		HTML_DL
 | |
| /dl		HTML_N_DL
 | |
| dt		HTML_DT
 | |
| dd		HTML_DD
 | |
| pre		HTML_PRE
 | |
| /pre		HTML_N_PRE
 | |
| blockquote	HTML_BLQ
 | |
| /blockquote	HTML_N_BLQ
 | |
| img		HTML_IMG
 | |
| image		HTML_IMG
 | |
| code		HTML_NOP
 | |
| /code		HTML_NOP
 | |
| dfn		HTML_NOP
 | |
| /dfn		HTML_NOP
 | |
| em		HTML_EM
 | |
| /em		HTML_N_EM
 | |
| cite		HTML_NOP
 | |
| /cite		HTML_NOP
 | |
| kbd		HTML_NOP
 | |
| /kbd		HTML_NOP
 | |
| samp		HTML_NOP
 | |
| /samp		HTML_NOP
 | |
| strong		HTML_EM
 | |
| /strong		HTML_N_EM
 | |
| var		HTML_NOP
 | |
| /var		HTML_NOP
 | |
| address		HTML_BR
 | |
| /address	HTML_BR
 | |
| xmp		HTML_XMP
 | |
| /xmp		HTML_N_XMP
 | |
| listing		HTML_LISTING
 | |
| /listing	HTML_N_LISTING
 | |
| plaintext	HTML_PLAINTEXT
 | |
| table		HTML_TABLE
 | |
| /table		HTML_N_TABLE
 | |
| meta		HTML_META
 | |
| /p		HTML_N_P
 | |
| frame		HTML_FRAME
 | |
| frameset	HTML_FRAMESET
 | |
| /frameset	HTML_N_FRAMESET
 | |
| noframes	HTML_NOFRAMES
 | |
| /noframes	HTML_N_NOFRAMES
 | |
| center		HTML_CENTER
 | |
| /center		HTML_N_CENTER
 | |
| font		HTML_FONT
 | |
| /font		HTML_N_FONT
 | |
| form		HTML_FORM
 | |
| /form		HTML_N_FORM
 | |
| input		HTML_INPUT
 | |
| textarea	HTML_TEXTAREA
 | |
| /textarea	HTML_N_TEXTAREA
 | |
| select		HTML_SELECT
 | |
| /select		HTML_N_SELECT
 | |
| option		HTML_OPTION
 | |
| /option		HTML_N_OPTION
 | |
| nobr		HTML_NOBR
 | |
| /nobr		HTML_N_NOBR
 | |
| div		HTML_DIV
 | |
| /div		HTML_N_DIV
 | |
| isindex		HTML_ISINDEX
 | |
| map		HTML_MAP
 | |
| /map		HTML_N_MAP
 | |
| area		HTML_AREA
 | |
| script		HTML_SCRIPT
 | |
| /script		HTML_N_SCRIPT
 | |
| base		HTML_BASE
 | |
| del		HTML_DEL
 | |
| /del		HTML_N_DEL
 | |
| strike		HTML_DEL
 | |
| /strike		HTML_N_DEL
 | |
| s		HTML_DEL
 | |
| /s		HTML_N_DEL
 | |
| ins		HTML_INS
 | |
| /ins		HTML_N_INS
 | |
| u		HTML_U
 | |
| /u		HTML_N_U
 | |
| style		HTML_STYLE
 | |
| /style		HTML_N_STYLE
 | |
| wbr		HTML_WBR
 | |
| head           HTML_HEAD
 | |
| /head          HTML_N_HEAD
 | |
| body		HTML_BODY
 | |
| /body		HTML_N_BODY
 | |
| html		HTML_BODY
 | |
| /html		HTML_N_BODY
 | |
| doctype                HTML_DOCTYPE
 | |
| tr		HTML_TR
 | |
| /tr		HTML_N_TR
 | |
| td		HTML_TD
 | |
| /td		HTML_N_TD
 | |
| th		HTML_TH
 | |
| /th		HTML_N_TH
 | |
| caption		HTML_CAPTION
 | |
| /caption	HTML_N_CAPTION
 | |
| thead           HTML_THEAD
 | |
| /thead          HTML_N_THEAD
 | |
| tbody           HTML_TBODY
 | |
| /tbody          HTML_N_TBODY
 | |
| tfoot           HTML_TFOOT
 | |
| /tfoot          HTML_N_TFOOT
 | |
| colgroup        HTML_COLGROUP
 | |
| /colgroup       HTML_N_COLGROUP
 | |
| col             HTML_COL
 | |
| table_alt	HTML_TABLE_ALT
 | |
| _rule		HTML_RULE
 | |
| /_rule		HTML_N_RULE
 | |
| title_alt	HTML_TITLE_ALT
 | |
| form_int	HTML_FORM_INT
 | |
| /form_int	HTML_N_FORM_INT
 | |
| input_alt	HTML_INPUT_ALT
 | |
| /input_alt	HTML_N_INPUT_ALT
 | |
| img_alt		HTML_IMG_ALT
 | |
| /img_alt	HTML_N_IMG_ALT
 | |
| eol		HTML_EOL
 | |
| pre_int		HTML_PRE_INT
 | |
| /pre_int	HTML_N_PRE_INT
 | |
| bgsound		HTML_BGSOUND
 | |
| applet		HTML_APPLET
 | |
| embed		HTML_EMBED
 |