* 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>
		
	
		
			
				
	
	
		
			180 lines
		
	
	
		
			5.2 KiB
		
	
	
	
		
			Plaintext
		
	
	
	
	
	
			
		
		
	
	
			180 lines
		
	
	
		
			5.2 KiB
		
	
	
	
		
			Plaintext
		
	
	
	
	
	
# $Id: XMakefile,v 1.20 2002/01/31 17:54:48 ukai Exp $
 | 
						|
SRCS=main.c file.c buffer.c display.c etc.c search.c linein.c table.c local.c \
 | 
						|
	form.c map.c frame.c rc.c menu.c mailcap.c image.c\
 | 
						|
	func.c cookie.c history.c backend.c $(KEYBIND_SRC)
 | 
						|
OBJS=main.o file.o buffer.o display.o etc.o search.o linein.o table.o local.o\
 | 
						|
	form.o map.o frame.o rc.o menu.o mailcap.o image.o\
 | 
						|
	func.o cookie.o history.o backend.o $(KEYBIND_OBJ)
 | 
						|
LSRCS=terms.c conv.c url.c ftp.c anchor.c mimehead.c parsetagx.c\
 | 
						|
	tagtable.c istream.c
 | 
						|
LOBJS=terms.o conv.o url.o ftp.o anchor.o mimehead.o parsetagx.o\
 | 
						|
	tagtable.o istream.o
 | 
						|
LLOBJS=version.o
 | 
						|
ALIBOBJS=Str.o indep.o regex.o textlist.o parsetag.o myctype.o entity.o hash.o
 | 
						|
ALIB=libindep.a
 | 
						|
ALLOBJS=$(OBJS) $(LOBJS) $(LLOBJS)
 | 
						|
 | 
						|
TARGET=w3m$(EXT)
 | 
						|
BOOKMARKER=w3mbookmark$(EXT)
 | 
						|
HELPER=w3mhelperpanel$(EXT)
 | 
						|
INFLATE=inflate$(EXT)
 | 
						|
IMGDISPLAY=w3mimgdisplay$(EXT)
 | 
						|
IMGSIZE=w3mimgsize$(EXT)
 | 
						|
TARGETS=$(TARGET) $(EXT_TARGETS)
 | 
						|
HELP_ALLFILES=w3mhelp-w3m_en.html w3mhelp-w3m_ja.html \
 | 
						|
	w3mhelp-lynx_en.html w3mhelp-lynx_ja.html
 | 
						|
 | 
						|
SCRIPTSUBDIRS = scripts scripts/multipart scripts/w3mman
 | 
						|
SUBDIRS = $(SCRIPTSUBDIRS)
 | 
						|
 | 
						|
INCLUDES=-I.
 | 
						|
 | 
						|
DEFS=$(INCLUDES) # -DDEBUG
 | 
						|
CFLAGS=$(OPTS) $(MYCFLAGS) $(DEFS) 
 | 
						|
LIBS=-L. -lindep $(GCLIB) $(MATHLIB) $(LOCAL_LIBRARIES) $(SYS_LIBRARIES)
 | 
						|
LIBS2=-L. -lindep $(GCLIB) $(LOCAL_LIBRARIES)
 | 
						|
INSTALL=sh install-sh
 | 
						|
INSTALL_PROGRAM=$(INSTALL) -m 755 -s
 | 
						|
INSTALL_SCRIPT=$(INSTALL) -m 755
 | 
						|
INSTALL_DATA=$(INSTALL) -m 644
 | 
						|
AR=ar
 | 
						|
 | 
						|
all: $(TARGETS) all-scripts
 | 
						|
 | 
						|
$(TARGET): $(ALLOBJS) $(ALIB) $(GCTARGET)
 | 
						|
	$(CC) $(CFLAGS) -o $(TARGET) $(ALLOBJS) $(LIBS)
 | 
						|
 | 
						|
$(ALIB): $(ALIBOBJS)
 | 
						|
	$(AR) rv $(ALIB) $(ALIBOBJS)
 | 
						|
	$(RANLIB) $(ALIB)
 | 
						|
 | 
						|
$(OBJS): fm.h funcname1.h
 | 
						|
 | 
						|
tagtable.c: html.h tagtable.tab mktable$(EXT)
 | 
						|
	./mktable$(EXT) 100 tagtable.tab > tagtable.c
 | 
						|
 | 
						|
# entity.h: html.h entity.tab mktable$(EXT)
 | 
						|
#	./mktable 100 entity.tab > entity.h
 | 
						|
 | 
						|
func.o: funcname.c functable.c funcname1.h
 | 
						|
keybind.o: funcname2.h
 | 
						|
keybind_lynx.o: funcname2.h
 | 
						|
parsetagx.o: html.c
 | 
						|
 | 
						|
funcname.c: funcname.tab
 | 
						|
	sort funcname.tab | awk -f funcname0.awk > funcname.c
 | 
						|
 | 
						|
funcname1.h: funcname.tab
 | 
						|
	sort funcname.tab | awk -f funcname1.awk > funcname1.h
 | 
						|
 | 
						|
funcname2.h: funcname.tab
 | 
						|
	sort funcname.tab | awk -f funcname2.awk > funcname2.h
 | 
						|
 | 
						|
functable.c: funcname.tab mktable$(EXT)
 | 
						|
	sort funcname.tab | awk -f functable.awk > functable.tab
 | 
						|
	./mktable$(EXT) 100 functable.tab > functable.c
 | 
						|
	-rm -f functable.tab
 | 
						|
 | 
						|
mktable$(EXT): mktable.o hash.o $(ALIB) $(GCTARGET)
 | 
						|
	$(CC) $(CFLAGS) -o mktable$(EXT) mktable.o hash.o  $(LIBS2)
 | 
						|
 | 
						|
$(BOOKMARKER): w3mbookmark.o $(ALIB) $(GCTARGET)
 | 
						|
	$(CC) $(CFLAGS) -o $(BOOKMARKER) w3mbookmark.o  $(LIBS2)
 | 
						|
 | 
						|
$(HELPER): w3mhelperpanel.o $(ALIB) $(GCTARGET)
 | 
						|
	$(CC) $(CFLAGS) -o $(HELPER) w3mhelperpanel.o  $(LIBS2)
 | 
						|
 | 
						|
$(INFLATE): inflate.o
 | 
						|
	$(CC) $(CFLAGS) $(Z_CFLAGS) -o $(INFLATE) inflate.o $(ZLIB)
 | 
						|
 | 
						|
inflate.o: inflate.c
 | 
						|
	$(CC) $(CFLAGS) $(Z_CFLAGS) -c inflate.c
 | 
						|
 | 
						|
$(IMGDISPLAY): w3mimgdisplay.o
 | 
						|
	$(CC) $(CFLAGS) `imlib-config --cflags` -o $(IMGDISPLAY) \
 | 
						|
		w3mimgdisplay.o `imlib-config --libs`
 | 
						|
 | 
						|
$(IMGSIZE): w3mimgsize.o
 | 
						|
	$(CC) $(CFLAGS) `imlib-config --cflags` -o $(IMGSIZE) \
 | 
						|
		w3mimgsize.o `imlib-config --libs`
 | 
						|
 | 
						|
w3mimgdisplay.o: w3mimgdisplay.c
 | 
						|
	$(CC) $(CFLAGS) `imlib-config --cflags` -c w3mimgdisplay.c
 | 
						|
 | 
						|
w3mimgsize.o: w3mimgsize.c
 | 
						|
	$(CC) $(CFLAGS) `imlib-config --cflags` -c w3mimgsize.c
 | 
						|
 | 
						|
gc/gc.a:
 | 
						|
	cd gc; $(MAKE) CC='$(CC)' CFLAGS='$(GCCFLAGS) $(GC_CFLAGS)' SPECIALCFLAGS='-I./\$(srcdir)/include $(GC_CFLAGS)'
 | 
						|
 | 
						|
 | 
						|
install: install-core install-scripts
 | 
						|
 | 
						|
install-core: $(TARGETS)
 | 
						|
	-$(MKDIR) $(DESTDIR)$(BIN_DIR)
 | 
						|
	-$(MKDIR) $(DESTDIR)$(HELP_DIR)
 | 
						|
	-$(MKDIR) $(DESTDIR)$(LIB_DIR)
 | 
						|
	$(INSTALL_PROGRAM) $(TARGET) $(DESTDIR)$(BIN_DIR)/$(TARGET)
 | 
						|
	$(INSTALL_DATA) $(HELP_FILE) $(DESTDIR)$(HELP_DIR)/w3mhelp.html
 | 
						|
	for file in $(EXT_TARGETS); \
 | 
						|
	do \
 | 
						|
		$(INSTALL_PROGRAM) $$file $(DESTDIR)$(LIB_DIR)/$$file; \
 | 
						|
	done
 | 
						|
 | 
						|
install-helpfile:
 | 
						|
	-$(MKDIR) $(DESTDIR)$(HELP_DIR)
 | 
						|
	for file in $(HELP_ALLFILES); \
 | 
						|
	do \
 | 
						|
		$(INSTALL_DATA) $$file $(DESTDIR)$(HELP_DIR)/$$file; \
 | 
						|
	done
 | 
						|
 | 
						|
all-scripts:
 | 
						|
	for dir in $(SCRIPTSUBDIRS);	\
 | 
						|
	do	\
 | 
						|
		(cd $$dir; $(MAKE) PERL='$(PERL)' BIN_DIR='$(BIN_DIR)' LIB_DIR='$(LIB_DIR)' HELP_DIR='$(HELP_DIR)' RC_DIR='$(RC_DIR)');	\
 | 
						|
	done
 | 
						|
 | 
						|
install-scripts: all-scripts
 | 
						|
	topdir=`pwd`; \
 | 
						|
	for dir in $(SCRIPTSUBDIRS);	\
 | 
						|
	do	\
 | 
						|
		(cd $$dir; $(MAKE) PERL='$(PERL)' MKDIR='$(MKDIR)' BIN_DIR='$(BIN_DIR)' LIB_DIR='$(LIB_DIR)' HELP_DIR='$(HELP_DIR)' DESTDIR='$(DESTDIR)' INSTALL="sh $$topdir/install-sh" install);	\
 | 
						|
	done
 | 
						|
 | 
						|
uninstall:
 | 
						|
	-rm -f $(BIN_DIR)/$(TARGET)
 | 
						|
	-for file in $(EXT_TARGETS); \
 | 
						|
	do \
 | 
						|
		rm -f $(LIB_DIR)/$$file; \
 | 
						|
	done
 | 
						|
	-for file in $(HELP_ALLFILES); \
 | 
						|
	do \
 | 
						|
		rm -f $(HELP_DIR)/$$file; \
 | 
						|
	done
 | 
						|
	-for dir in $(SCRIPTSUBDIRS);	\
 | 
						|
	do	\
 | 
						|
		(cd $$dir; $(MAKE) BIN_DIR='$(BIN_DIR)' LIB_DIR='$(LIB_DIR)' HELP_DIR='$(HELP_DIR)' uninstall); \
 | 
						|
	done
 | 
						|
 | 
						|
clean: sweep
 | 
						|
	-rm -f *.o *.a $(TARGETS) mktable$(EXT)
 | 
						|
	-rm -f funcname.c funcname1.h funcname2.h tagtable.c functable.c
 | 
						|
	-for dir in $(SCRIPTSUBDIRS);	\
 | 
						|
	do	\
 | 
						|
		(cd $$dir; $(MAKE) clean); \
 | 
						|
	done
 | 
						|
 | 
						|
sweep:
 | 
						|
	-rm -f core *~ *.bak *.orig *.rej
 | 
						|
 | 
						|
depend: 
 | 
						|
	makedepend $(CFLAGS) *.c
 | 
						|
 | 
						|
dist:
 | 
						|
	cd ..; mv w3m w3m-$(VERSION); tar cvfz w3m-$(VERSION).tar.gz w3m-$(VERSION); mv w3m-$(VERSION) w3m
 | 
						|
 | 
						|
bindist:
 | 
						|
	cd ..; mv w3m w3m-$(VERSION); tar cvfz w3m-$(VERSION)-$(MODEL).tar.gz w3m-$(VERSION)/{w3m*,doc*,Bonus*,README,scripts}; mv w3m-$(VERSION) w3m
 | 
						|
 | 
						|
# DO NOT DELETE
 |