* 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>
		
	
		
			
				
	
	
		
			260 lines
		
	
	
		
			5.6 KiB
		
	
	
	
		
			Plaintext
		
	
	
	
	
	
			
		
		
	
	
			260 lines
		
	
	
		
			5.6 KiB
		
	
	
	
		
			Plaintext
		
	
	
	
	
	
| /*
 | |
|  * Configuration for w3m
 | |
|  * This is sample.  ./configure will generate config.h for you.
 | |
|  */
 | |
| 
 | |
| #ifndef _CONFIGURED_
 | |
| #define _CONFIGURED_
 | |
| 
 | |
| /* User Configuration */
 | |
| 
 | |
| /* 
 | |
|    If you define DICT, you can use dictionary look-up function
 | |
|    in w3m. See README.dict for detail.
 | |
| */
 | |
| #undef DICT
 | |
| 
 | |
| /*
 | |
|    If you want to load and save URL history.
 | |
|  */
 | |
| #define USE_HISTORY
 | |
| 
 | |
| /*
 | |
|    USE_BG_COLOR enables w3m to set background color.
 | |
|  */
 | |
| #define USE_BG_COLOR
 | |
| 
 | |
| /*
 | |
|  * Do word fill
 | |
|  */
 | |
| #undef FORMAT_NICE
 | |
| 
 | |
| /*
 | |
|  * Enable id attribute
 | |
|  */
 | |
| #define ID_EXT
 | |
| 
 | |
| /*
 | |
|  * Save Current-buffer Information
 | |
|  */
 | |
| #define BUFINFO
 | |
| 
 | |
| /*
 | |
|  * Support EGD (Entropy Gathering Daemon)
 | |
|  */
 | |
| #undef USE_EGD
 | |
| 
 | |
| /*
 | |
|  * Remove line trailing spaces in html buffer.
 | |
|  */
 | |
| #undef ENABLE_REMOVE_TRAILINGSPACES
 | |
| 
 | |
| /*
 | |
|  * thin chars for menu frame
 | |
|  */
 | |
| #undef MENU_THIN_FRAME
 | |
| 
 | |
| /*
 | |
|  */
 | |
| #undef TABLE_EXPAND
 | |
| #undef TABLE_NO_COMPACT
 | |
| #define NOWRAP
 | |
| #define MATRIX
 | |
| 
 | |
| /**********************************************************/
 | |
| #ifdef makefile_parameter
 | |
| 
 | |
| BIN_DIR = /usr/local/bin
 | |
| HELP_DIR = /usr/local/lib/w3m
 | |
| LIB_DIR = /usr/local/lib/w3m
 | |
| ETC_DIR = /usr/local/etc/w3m
 | |
| RC_DIR = ~/.w3m
 | |
| HELP_FILE = w3mhelp-w3m_ja.html
 | |
| SYS_LIBRARIES = -lgpm  -lbsd -lnsl -lncurses  -L/usr/lib -L/usr/lib -L/usr/local/ssl/lib -L/usr/local/ssl/lib -lssl -lcrypto 
 | |
| LOCAL_LIBRARIES = 
 | |
| CC = gcc
 | |
| MYCFLAGS = -O -I./gc/include  -I/usr/local/ssl/include/openssl -I/usr/local/ssl/include
 | |
| GCCFLAGS = -O -I./gc/include -I./$(srcdir)/include -DATOMIC_UNCOLLECTABLE -DNO_SIGNALS -DNO_EXECUTE_PERMISSION -DSILENT -DALL_INTERIOR_POINTERS
 | |
| KEYBIND_SRC = keybind.c
 | |
| KEYBIND_OBJ = keybind.o
 | |
| EXT=
 | |
| MATHLIB=-lm
 | |
| Z_CFLAGS=-I/usr/include
 | |
| ZLIB=-L/usr/lib -lz
 | |
| EXT_TARGETS=$(BOOKMARKER) $(HELPER) $(INFLATE)
 | |
| GC_CFLAGS=
 | |
| GCLIB=gc/gc.a
 | |
| GCTARGET=gc/gc.a
 | |
| RANLIB=ranlib
 | |
| MKDIR=mkdir -p
 | |
| PERL=/usr/local/bin/perl
 | |
| VERSION=0.2.2
 | |
| MODEL=Linux.i686-monster-ja
 | |
| #else
 | |
| 
 | |
| 
 | |
| #define DISPLAY_CODE 'E'
 | |
| #define SYSTEM_CODE 'E'
 | |
| 
 | |
| #define JA 0
 | |
| #define EN 1
 | |
| #define LANG JA
 | |
| #define KANJI_SYMBOLS
 | |
| #define USE_COLOR
 | |
| #undef USE_ANSI_COLOR
 | |
| #undef USE_MIGEMO
 | |
| #undef EMACS_LIKE_LINEEDIT
 | |
| #undef VI_PREC_NUM
 | |
| #undef USE_MARK
 | |
| #undef LABEL_TOPLINE
 | |
| #undef NEXTPAGE_TOPLINE
 | |
| #define USE_MOUSE
 | |
| #define USE_GPM
 | |
| #undef USE_SYSMOUSE
 | |
| #define USE_MENU
 | |
| #define USE_COOKIE
 | |
| #define USE_DIGEST_AUTH
 | |
| #define USE_SSL
 | |
| #undef USE_SSL_VERIFY
 | |
| #undef FTPPASS_HOSTNAMEGEN
 | |
| #undef USE_NNTP
 | |
| #undef USE_GOPHER
 | |
| #define USE_EXTERNAL_URI_LOADER
 | |
| #undef USE_ALARM
 | |
| #undef USE_IMAGE
 | |
| #define USE_HELP_CGI
 | |
| 
 | |
| #define DEF_EDITOR "/bin/vi"
 | |
| #define DEF_MAILER "/bin/mail"
 | |
| #define DEF_EXT_BROWSER "/usr/bin/netscape"
 | |
| 
 | |
| /* fallback viewer. mailcap override these configuration */
 | |
| #define DEF_IMAGE_VIEWER	"xv"
 | |
| #define DEF_AUDIO_PLAYER	"showaudio"
 | |
| 
 | |
| /* for USE_MIGEMO */
 | |
| #define DEF_MIGEMO_COMMAND	"migemo -t egrep /usr/share/migemo/migemo-dict"
 | |
| 
 | |
| #define LIB_DIR      "/usr/local/lib/w3m"
 | |
| #define HELP_DIR     "/usr/local/lib/w3m"
 | |
| #define ETC_DIR	     "/usr/local/etc/w3m"
 | |
| #define HELP_FILE    "w3mhelp.html"
 | |
| #define HELP_CGI     "w3mhelp"
 | |
| #define W3MCONFIG    "w3mconfig"
 | |
| #define IMGSIZE      "w3mimgsize"
 | |
| #define IMGDISPLAY   "w3mimgdisplay"
 | |
| 
 | |
| #define RC_DIR       "~/.w3m"
 | |
| #define BOOKMARK     "bookmark.html"
 | |
| #define CONFIG_FILE  "config"
 | |
| #define KEYMAP_FILE  "keymap"
 | |
| #define MENU_FILE    "menu"
 | |
| #define COOKIE_FILE  "cookie"
 | |
| #define HISTORY_FILE "history"
 | |
| 
 | |
| #define USER_MAILCAP RC_DIR "/mailcap"
 | |
| #define SYS_MAILCAP  "/etc/mailcap"
 | |
| #define USER_MIMETYPES "~/.mime.types"
 | |
| #define SYS_MIMETYPES "/usr/local/lib/mime.types"
 | |
| #define USER_URIMETHODMAP RC_DIR "/urimethodmap"
 | |
| #define SYS_URIMETHODMAP  ETC_DIR "/urimethodmap"
 | |
| 
 | |
| #define DEF_SAVE_FILE "index.html"
 | |
| 
 | |
| #undef USE_BINMODE_STREAM
 | |
| #define HAVE_TERMIOS_H
 | |
| #define HAVE_DIRENT_H
 | |
| #define HAVE_STRCASECMP
 | |
| #define HAVE_STRCASESTR
 | |
| #define HAVE_STRCHR
 | |
| #define HAVE_STRERROR
 | |
| #define HAVE_SYS_ERRLIST
 | |
| #define HAVE_BCOPY
 | |
| #define HAVE_WAITPID
 | |
| #define HAVE_WAIT3
 | |
| #define HAVE_STRFTIME
 | |
| #define HAVE_GETCWD
 | |
| #define HAVE_GETWD
 | |
| #define HAVE_READLINK
 | |
| #define HAVE_SETENV
 | |
| #define HAVE_PUTENV
 | |
| #define HAVE_SRAND48
 | |
| #define HAVE_SRANDOM
 | |
| #undef HAVE_GETPASSPHRASE
 | |
| #define HAVE_CHDIR
 | |
| 
 | |
| 
 | |
| #define SETJMP(env) sigsetjmp(env,1)
 | |
| #define LONGJMP(env,val) siglongjmp(env,val)
 | |
| #define JMP_BUF sigjmp_buf
 | |
| #define HAVE_FLOAT_H
 | |
| #define HAVE_SYS_SELECT_H
 | |
| 
 | |
| typedef void MySignalHandler;
 | |
| #define SIGNAL_ARG int _dummy
 | |
| #define SIGNAL_ARGLIST 0
 | |
| #define SIGNAL_RETURN return
 | |
| #define HAVE_SETPGRP
 | |
| 
 | |
| /*
 | |
|    If you want to use IPv6, define this symbol.
 | |
|  */
 | |
| #undef INET6
 | |
| 
 | |
| /** dont edit below **/
 | |
| #ifndef HAVE_SRAND48
 | |
| #ifdef HAVE_SRANDOM
 | |
| #define srand48 srandom
 | |
| #define lrand48 random
 | |
| #else /* HAVE_SRANDOM */
 | |
| #define USE_INCLUDED_SRAND48
 | |
| #endif /* HAVE_SRANDOM */
 | |
| #endif
 | |
| 
 | |
| #if defined( __CYGWIN32__ ) && !defined( __CYGWIN__ )
 | |
| #define __CYGWIN__
 | |
| #endif
 | |
| 
 | |
| #if defined( __CYGWIN__ ) || defined( __EMX__ )
 | |
| #define SUPPORT_DOS_DRIVE_PREFIX 1
 | |
| #endif
 | |
| 
 | |
| #if defined( __CYGWIN__ )
 | |
| #define SUPPORT_NETBIOS_SHARE 1
 | |
| #endif
 | |
| 
 | |
| #if defined(__DJGPP__)
 | |
| #define DEFAULT_TERM	"dosansi"
 | |
| #else
 | |
| #define DEFAULT_TERM	0	/* XXX */
 | |
| #endif
 | |
| 
 | |
| #if defined(__EMX__) /* use $extension? */
 | |
| #define GUNZIP_CMDNAME  "gzip"
 | |
| #define BUNZIP2_CMDNAME "bzip2"
 | |
| #define INFLATE_CMDNAME  "inflate.exe"
 | |
| #define W3MBOOKMARK_CMDNAME	"w3mbookmark.exe"
 | |
| #define W3MHELPERPANEL_CMDNAME	"w3mhelperpanel.exe"
 | |
| #define DEV_NULL_PATH	"nul"
 | |
| #define DEV_TTY_PATH	"con"
 | |
| #define CGI_EXTENSION	".cmd"
 | |
| #else
 | |
| #define GUNZIP_CMDNAME  "gunzip"
 | |
| #define BUNZIP2_CMDNAME "bunzip2"
 | |
| #define INFLATE_CMDNAME  "inflate"
 | |
| #define W3MBOOKMARK_CMDNAME	"w3mbookmark"
 | |
| #define W3MHELPERPANEL_CMDNAME	"w3mhelperpanel"
 | |
| #define DEV_NULL_PATH	"/dev/null"
 | |
| #define DEV_TTY_PATH	"/dev/tty"
 | |
| #define CGI_EXTENSION	".cgi"
 | |
| #endif
 | |
| 
 | |
| #define PATH_SEPARATOR	':'
 | |
| #define GUNZIP_NAME  "gunzip"
 | |
| #define BUNZIP2_NAME "bunzip2"
 | |
| #define INFLATE_NAME "inflate"
 | |
| 
 | |
| #endif /* makefile_parameter */
 | |
| #endif /* _CONFIGURED_ */
 | |
| 
 |