Commit Graph

59 Commits

Author SHA1 Message Date
Fumitoshi UKAI
0b0ee55a7c * w3mimg/fb/fb_gdkpixbuf.c (fb_image_load):
fix unused variable `i'
* w3mimg/x11/x11_w3mimg.c (x11_load_image):
  ditto
2004-11-08 17:14:06 +00:00
Fumitoshi UKAI
44c494c8f3 [w3m-dev 04128] Re: w3mimgdisplay
* acinclude.m4 (AC_W3M_IMAGE): check not yes
* aclocal.m4, configure: regen
* w3mimg/fb/fb_gdkpixbuf.c (fb_image_load):
   fb_image_fill in case GDK_PIXBUF_FRAME_DISPOSE
* w3mimg/x11/x11_w3mimg.c (get_animation_size):
   return n
  (x11_load_image):
   fill in case GDK_PIXBUF_FRAME_DISPOSE
2004-11-08 17:08:09 +00:00
Fumitoshi UKAI
7d5328d6d8 [w3m-dev 04099] Re: w3m-img gtk2
* w3mimg/fb/fb_gdkpixbuf.c (fb_image_load): fix resize bug
From: Hiroyuki Ito <ZXB01226@nifty.com>
2004-08-16 16:56:39 +00:00
Fumitoshi UKAI
151d79ed87 [w3m-dev 04097] Re: w3m-img gtk2
* w3mimg/fb/fb_gdkpixbuf.c (draw): no need bg
	(get_animation_size): use GTimeVal
	(fb_image_load): use GTimeVal
			fix for animation
* w3mimg/x11/x11_w3mimg.c (get_animation_size): use GTimeVal
	(x11_load_image): use GTimeVal
			fix for animation
From: Hiroyuki Ito <ZXB01226@nifty.com>
2004-08-05 18:22:15 +00:00
Fumitoshi UKAI
d16ac274cf [w3m-dev 04096] w3m-img gtk2
* acinclude.m4 (AC_W3M_IMAGE): add USE_GTK2
	add --with-imagelib=gtk2
* aclocal.m4 config.guess config.sub configure: regen
* config.h.in: add USE_GTK2
* w3mimg/fb/fb_gdkpixbuf.c: support USE_GTK2
* w3mimg/fb/fb_img.h: add fb_image_init()
* w3mimg/fb/fb_imlib2.h: fb_image_init() stub
* w3mimg/fb/fb_w3mimg.c: call fb_image_init()
* w3mimg/x11/x11_w3mimg.c: support USE_GTK2
From: Fumitoshi UKAI  <ukai@debian.or.jp>
2004-08-04 17:32:27 +00:00
Fumitoshi UKAI
8d410b5b46 [w3m-dev 04073] Re: run configure in another directory
* Makefile.in (CFLAGS): include dir here
	(DEFS): delete include dirs
	(libwc/libwc.a): pass OPTS only
	(w3mimg/w3mimg.a): pass OPTS only
* libwc/Makefile.in (CFLAGS): fixed
* w3mimg/Makefile.in (CFLAGS): added
	(fb x11): pass OPTS only
* w3mimg/fb/Makefile.in (CFLAGS): added
* w3mimg/x11/Makefile.in (CFLAGS): added
From: Fumitoshi UKAI  <ukai@debian.or.jp>
2004-04-26 17:00:37 +00:00
Fumitoshi UKAI
e4e1dd26a2 [w3m-dev 04063] about Makefile
* Makefile.in (DEFS): use CGIBIN_DIR instead of LIB_DIR
	(MAKE_ARGS): ditto
	(distclean): rm -f
* config.h.dist: use CGIBIN_DIR instead of LIB_DIR
* indep.c (w3m_lib_dir): ditto
* scripts/Makefile.in: ditto
* scripts/multipart/Makefile.in: ditto
* w3mimg/Makefile.in (clearn): remove w3mimg.a
From: SAKAI Kiyotaka <ksakai@kso.netwk.ntt-at.co.jp>
2004-04-09 17:18:48 +00:00
Fumitoshi UKAI
f08bbbd360 w3mimg/Makefile.in (distclean): rm -f w3mimg.a
From: Fumitoshi UKAI  <ukai@debian.or.jp>
2004-03-21 16:01:38 +00:00
Fumitoshi UKAI
a9e7448970 [w3m-dev 04022] $^
* Makefile.in (DEFUNS): added
	funcname.tab: don't use $^
* w3mimg/Makefile.in (w3mimg.a): don't use $^
From: YONETANI Tomokazu <qhwt@myrealbox.com>
2003-12-08 16:15:17 +00:00
Fumitoshi UKAI
e99561b348 * scripts/Makefile.in (w3mhelp-funcname.pl): depends ../funcname.tab
* Makefile.in (IMGOBJS): deleted
	(indep.o): depends on fm.h funcname1.h
	(IMGDISPLAY): depends on w3mimg/w3mimg.a
	(w3mimg/w3mimg.a): renamed from w3mimg
* acinclude.m4 (AC_W3M_IMAGE): modify IMBOBJS
* w3mimg/Makefile.in (AR): added
		(RANLIB): added
		(IMGOBJS): added
		(w3mimg.a): added
From: Fumitoshi UKAI  <ukai@debian.or.jp>

* [w3m-dev 03990] Re: post-m17n merge problem?
* Makefile.in (MAN1): need $(top_srcdir)
		(MAN1_JA): ditto
		(LOBJS): depends on fm.h funcname1.h
		(INFLATE): depends on $(ALIB)
		(libwc/libwc.a): renamed from libwc
		(IMGDISPLAY): depends on $(IMGOBJS) instead of w3mimg
			  depends on $(ALIB)
		(w3mimgdisplay.o): depends on w3mimg/w3mimg.h
* acinclude.m4 (AC_W3M_M17N): WCTARGET is libwc/libwc.a
* configure.in (HELP_DIR): expand ${prefix}
From: qhwt@myrealbox.com
2003-10-10 16:33:13 +00:00
Fumitoshi UKAI
44f4bc70f7 distclean 2003-09-29 16:37:13 +00:00
Fumitoshi UKAI
3c576cd040 distclean 2003-09-29 16:37:13 +00:00
Fumitoshi UKAI
cd007d6830 based on [w3m-dev 03970]
SAKAI Kiyotaka <ksakai@kso.netwk.ntt-at.co.jp>
* acinclude.m4 (AC_W3M_IMAGE): add IMGTARGETS
* w3mimg/Makefile.in (all): use @IMGTARGETS@
From: Fumitoshi UKAI  <ukai@debian.or.jp>
2003-09-24 14:05:06 +00:00
Fumitoshi UKAI
655e0f310b fix top_srcdir 2003-09-22 23:12:56 +00:00
Fumitoshi UKAI
149ff2aa6f more autoconfiscate 2003-09-22 22:53:52 +00:00
Fumitoshi UKAI
2086c1e90c [w3m-dev 03958] w3mimgdisplay on jfbterm
* w3mimg/fb/fb_w3mimg.c (w3mimg_fbopen): check TERM=jfbterm
From: Fumitoshi UKAI  <ukai@debian.or.jp>
2003-08-29 15:06:52 +00:00
Fumitoshi UKAI
c5b12782d9 [w3m-dev 03938] clear region margin
* w3mimgdisplay.c (clearMargin): added
	(GetOption): add -margin
	(ClearImage): clear margin
* w3mi,g/w3mimg.h (w3mimg_op): clear_margin
* w3mimg/fb/fb.c (fb_clear): x,y must be >= 0
* w3mimg/x11/x11_w3mimg.c (x11_clear): x,y must be >= 0
From: Hiroyuki Ito <hito@crl.go.jp>
2003-07-13 16:19:09 +00:00
Fumitoshi UKAI
5d34647d89 * w3mimg/fb/fb_img.h (get_image_size): add missing prototypes
* w3mimg/fb/fb.c (fb_clear): unused variable `j'
From: Fumitoshi UKAI  <ukai@debian.or.jp>
2003-07-09 15:07:10 +00:00
Fumitoshi UKAI
6d3c0f1d40 [w3m-dev 03935] Re: clear image
* w3mimg/fb/fb.c (fb_get_packed_color): added
	(fb_image_pset): use fb_get_packed_color
	(fb_image_fill): use fb_get_packed_color
	(fb_clear): use tmp to store pixels
From: Hiroyuki Ito <hito@crl.go.jp>
2003-07-09 15:02:28 +00:00
Fumitoshi UKAI
d334c03205 [w3m-dev 03934] Re: clear image
* w3mimg/x11/x11_w3mimg.c (x11_clear): s/FALSE/False/
From: ABE Yuji <cbo46560@pop12.odn.ne.jp>
2003-07-08 17:32:12 +00:00
Fumitoshi UKAI
fd849ba01d fix indent 2003-07-08 17:30:37 +00:00
Fumitoshi UKAI
34378b4a46 [w3m-dev 03931] Re: clear image
* w3mimgdisplay.c (ClearImage): offset
* w3mimg/fb/fb.c (fb_clear): memcpy by pixel_size
From: Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
2003-07-08 17:29:56 +00:00
Fumitoshi UKAI
851c96514f fix indent 2003-07-07 15:49:03 +00:00
Fumitoshi UKAI
0bbf6748bb [w3m-dev 03929] clear image
* image.c (syncImage): added
	(drawImage): rewrite using syncImage()
	(clearImage): use clear image command (6)
* w3mimgdisplay.c: change protocol
	2 => terminate drawing
	6 => clear image
	(main): '2' calls TermImage()
		'6' calls ClearImage()
		TermImage() when exit
	(TermImage): renamed from ClearImage
	(ClearImage): rewritten to call w_op->clear()
* w3mimg.h/w3mimg.h (w3mimg_op): add clear()
* w3mimg/fb/fb.c (fb_clear): added
* w3mimg/fb/fb.h (fb_clear): added
* w3mimg/fb/fb_img.c (fb_image_clear): added
* w3mimg/fb/fb_w3mimg.c (w3mfb_clear): added
	(w3mimg_fbopen): initialize wop->clear
* w3mimg/x11/x11_w3mimg.c (x11_clear): added
	(w3mimg_x11open): initialize wop->clear
From: Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
2003-07-07 15:48:16 +00:00
Fumitoshi UKAI
73c3738780 fix indent 2003-06-13 15:03:35 +00:00
Fumitoshi UKAI
2de1e03896 [w3m-dev 03913] fix gif animation support
* w3mimg/fb/fb_gdkpixbuf.c (fb_image_load): fix gif animation
* w3mimg/x11/x11_w3mimg.c (x11_load_image): ditto
From: Hiroyuki Ito <hito@crl.go.jp>
2003-06-13 15:03:02 +00:00
Fumitoshi UKAI
4fadb14e79 fix indent 2003-04-03 16:36:33 +00:00
Fumitoshi UKAI
fdb83cd002 [w3m-dev 03837] Re: gif animation with no delay_time
* w3mimg/fb/fb_gdkpixbuf.c (get_animation_size): add delay
			check delay_time
	(get_image_size): no need delay time
	(fb_image_load): check delay
	(draw): no bg
* w3mimg/fb/fb_w3mimg.c (w3mfb_show_image): delete delay skip loop
* w3mimg/x11/x11_w3mimg.c (get_animation_size): add delay
			check delay_time
	(x11_load_image): check delay
	(x11_get_image_size): no need delay time
From: Hiroyuki Ito <hito@crl.go.jp>
2003-04-03 16:35:42 +00:00
Fumitoshi UKAI
68c1a714cb [w3m-dev 03834] Re: gif animation with no delay_time
* w3mimg/x11/x11_w3mimg.c (x11_load_image): fix delay check
From: ABE Yuji <cbo46560@pop12.odn.ne.jp>
2003-03-27 17:12:08 +00:00
Fumitoshi UKAI
5eeb410779 fix indent 2003-03-26 15:34:55 +00:00
Fumitoshi UKAI
eeaceedf3d [w3m-dev 03833] gif animation with no delay_time
* w3mimg/fb/fb_w3mimg.c (w3mfb_show_image): skip delay<=0
* w3mimg/x11/x11_w3mimg.c (x11_image): add delay
	(x11_img_new): initialize delay
	(x11_load_image): initialize delay
	(x11_show_image): jump to last image if delay<=0
From: ABE Yuji <cbo46560@pop12.odn.ne.jp>
2003-03-26 15:34:12 +00:00
Fumitoshi UKAI
9c276f465f [w3m-dev 03830] Image size of gif animation
* w3mimg/fb/fb_gdkpixbuf.c (get_animation_size): added
	(get_image_size): use get_animation_size()
	(fb_image_load): ditto
* w3mimg/x11/x11_w3mimg.c (get_animation_size): added
	(x11_load_image): use get_animation_size()
	(x11_get_image_size): ditto
From: Hiroyuki Ito <hito@crl.go.jp>
2003-03-26 15:14:19 +00:00
Fumitoshi UKAI
be3a582bd4 fix indent 2003-03-24 15:47:49 +00:00
Fumitoshi UKAI
b8b37f8727 [w3m-dev 03829] w3mimgdisplay -anim
* w3mimgdisplay.c (maxAnim): added, default 100
	(main): add --anim option, w_op->max_anim
* w3mimg/w3mimg.h (w3mimg_op): add max_anim
* w3mimg/fb/fb_gdkpixbuf.c (fb_image_load): add max_anim
* w3mimg/fb/fb_img.h (fb_image_load): add max_anim args
* w3mimg/fb/fb_imlib2.c (fb_image_load): add max_anim args
* w3mimg/fb/fb_w3mimg.c (w3mfb_load_image): pass max_anim
* w3mimg/x11/x11_w3mimg.c (x11_load_image): max_anim
From: Hiroyuki Ito <hito@crl.go.jp>
2003-03-24 15:45:55 +00:00
Fumitoshi UKAI
fe1c985ccc [w3m-dev 03665] imlib2 support (on X11)
* configure: X11 inline image with Imlib2
	fix typo in fb/imlib2
* w3mimg/x11/x11_w3mimg.c: USE_IMLIB2
	(x11_load_image): USE_IMLIB2
	(x11_show_image): USE_IMLIB2
	(x11_free_image): USE_IMLIB2
	(x11_get_image_size): USE_IMLIB2
From: Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
2003-01-21 15:38:55 +00:00
Fumitoshi UKAI
17e7c1ae51 fix indent 2002-12-25 16:18:19 +00:00
Fumitoshi UKAI
d31151945a [w3m-dev 03602] Re: w3mimgdisplay core dump
* w3mimgdisplay.c (DrawImage): check load_image, imageBuf[n].pixmap
* w3mimg/fb/fb_w3mimg.c (w3mfb_show_image): check img->pixmap
* w3mimg/x11/x11_w3mimg.c (x11_show_image): check img->pixmap
From: Hiroyuki Ito <hito@crl.go.jp>
2002-12-25 16:14:45 +00:00
Fumitoshi UKAI
eee9736e27 [w3m-dev 03379] setuid w3mimgdisplay and check console tty
* XMakefile: w3mimgdisplay install by INSTALL_W3MIMGDISPLAY
* configure: ask setuid w3mimgdisplay
	(w3mimgdisplay_setuid): added
	(INSTALL_W3MIMGDISPLAY): added
* etc.c (mySystem): close until FOPEN_MAX
* image.c (openImgdisplay): setenv W3M_TTY
		stderr to /dev/null
		close until FOPEN_MAX
* install-sh: -o, -g for owner, group
* proto.h (ttyname_tty): added
* search.c (open_migemo): stderr to /dev/null
		close until FOPEN_MAX
* terms.c (ttyname_tty): added
* w3mimgdisplay.c: include <sys/types.h>, <unistd.h>
		W3MIMGDISPLAY_SETUID
		stderr to /dev/null
* w3mimg/w3mimg.c: include <sys/types.h>, <unistd.h>
		W3MIMGDISPLAY_SETUID
* w3mimg/fb/fb_w3mimg.c (check_tty_console): added
From: Fumitoshi UKAI  <ukai@debian.or.jp>
2002-11-06 03:50:48 +00:00
Fumitoshi UKAI
dce9a74733 fix compilation warnings
* w3mimgdisplay.c: add #include <string.h> for strlen, strcmp
* w3mimg/fb/fb.c: add #include <string.h> for memset
* w3mimg/fb/fb_w3mimg.c: add #include <string.h> for memset
From: Fumitoshi UKAI  <ukai@debian.or.jp>
2002-10-31 09:36:21 +00:00
Fumitoshi UKAI
b107236efc [w3m-dev 03337] delete unused functions in fb.c etc. (Re: canna patch)
* w3mimg/fb/license.txt: removed, follow w3m license
2002-10-10 16:32:06 +00:00
Fumitoshi UKAI
936f9c669b * [w3m-dev 03337] delete unused functions in fb.c etc. (Re: canna patch)
* w3mimg/fb/fb.c (fb_image_rotate): delete
	(fb_frame_rotate): delete
	(fb_pset): delete
	(fb_get_color): delete
	(fb_clear): delete
	(fb_cmap_disp): delete
	(fb_fscrn_disp): delete
	(fb_vscrn_disp): delete
* w3mimg/fb/fb.h (fb_image_rotate): delete
	(fb_frame_rotate): delete
	(fb_pset): delete
	(fb_get_color): delete
	(fb_clear): delete
	(fb_cmap_disp): delete
	(fb_fscrn_disp): delete
	(fb_vscrn_disp): delete
* w3mimg/fb/fb_img.c (fb_image_draw_simple): delete
* w3mimg/fb/fb_img.h (fb_image_draw_simple): delete
From: Hiroyuki Ito <hito@crl.go.jp>
2002-10-10 16:15:55 +00:00
Fumitoshi UKAI
f21a195381 * [w3m-dev 03333] x11 image animation
* w3mimg/x11/x11_w3mimg.c (struct x11_image): added
	(x11_img_new): added
	(resize_image): added
	(x11_load_image): rewrite GdkPixbuf
	(x11_show_image): rewrite GdkPixbuf
	(x11_free_image): rewrite GdkPixbuf
From: Hiroyuki Ito <hito@crl.go.jp>
2002-10-05 16:43:10 +00:00
Fumitoshi UKAI
8fa8286f12 [w3m-dev 03332] Re: hang up when seeing web page that contains xbm file
* w3mimg/x11/x11_w3mimg.c (x11_load_image): transparent support
From: Yuji Abe <cbo46560@pop12.odn.ne.jp>
2002-10-01 15:34:20 +00:00
Fumitoshi UKAI
fa68f163df [w3m-dev 03330] Re: hang up when seeing web page that contains xbm file
* w3mimg/x11/x11_w3mimg.c (x11_load_image): scaling
From: Yuji Abe <cbo46560@pop12.odn.ne.jp>
2002-09-30 17:44:30 +00:00
Fumitoshi UKAI
6b3f98f6c7 [w3m-dev 03327] gdk-pixbuf support for w3m-img/x11
* configure (use_w3mimg_x11) Imlib1 or GdkPixbuf
	check gdkpixbuf
* w3mimg/x11/x11_w3mimg.c (USE_GDKPIXBUF): added
	(x11_init): USE_GDKPIXBUF
	(x11_load_image): USE_GDKPIXBUF
	(x11_get_image_size): USE_GDKPIXBUF
From: Yuji Abe <cbo46560@pop12.odn.ne.jp>
2002-09-29 15:29:12 +00:00
Fumitoshi UKAI
0e63c0c10c [w3m-dev 03300] framebuffer: 8bit color support
* w3mimg/fb/fb.c: support FB_VISUAL_PSEUDOCOLOR 256 colors
From: Hiroyuki Ito <hito@crl.go.jp>
2002-09-09 14:03:44 +00:00
Fumitoshi UKAI
0317882329 fix indent 2002-09-09 13:59:09 +00:00
Fumitoshi UKAI
2c36d5fe0d Debian Bug#154766: w3m-img: support DirectColor framebuffer visuals?
from Colin Watson <cjwatson@debian.org>
* w3mimg/fb/fb.c (fb_open): accept FB_VISUAL_DIRECTCOLOR
From: Fumitoshi UKAI  <ukai@debian.or.jp>
2002-07-30 16:03:00 +00:00
Fumitoshi UKAI
3e1846025a [w3m-dev 03282] Re: w3m-img for framebuffer update
* w3mimg/fb/fb.c (fb_image_new): ignore no image
				calloc multiple images
		(fb_image_fill): added
		(fb_image_draw): width, height fix
		(fb_image_rotate): fix typo
		(fb_image_copy): added
		(fb_frame_new): added
		(fb_freme_free): added
		(fb_frame_rotate): added
* w3mimg/fb/fb.h (FB_IMAGE): add num, id, delay
		(fb_frame_new): added
		(fb_frame_free): added
		(fb_frame_rotate): added
* w3mimg/fb/fb_gdkpixbuf.c (get_image_size): animation support
		(fb_image_load): animation support
		(draw): add bg, x, y, w, h args
* w3mimg/fb/fb_img.h (fb_image_load): return FB_IMAGE**
* w3mimg/fb/fb_imlib2.c (fb_image_load): return FB_IMAGE**
* w3mimg/fb/fb_w3mimg.c (w3mfb_show_image): animation support
From: Hiroyuki Ito <hito@crl.go.jp>
2002-07-29 15:25:37 +00:00
Fumitoshi UKAI
9f103b13bb [w3m-dev 03279] w3m-img for framebuffer update
http://homepage3.nifty.com/slokar/fb/w3mfb.patch.gz
* w3mimg/fb/readme.txt: update
* w3mimg/fb/fb.c: update
* w3mimg/fb/fb.h: update
* w3mimg/fb/fb_gdkpixbuf.c: update
* w3mimg/fb/fb_img.c: update
* w3mimg/fb/fb_img.h: update
* w3mimg/fb/fb_imlib2.c: update
* w3mimg/fb/fb_w3mimg.c: update
* w3mimg/fb/fb_gdkpixbuf.h: deleted
* w3mimg/fb/fb_imlib2.h: deleted
* w3mimg/w3mimg.h (w3mimg_op): add get_image_size()
* w3mimg/x11/x11_w3mimg.c: update
* w3mimgdisplay.c (main): use get_image_size()
* w3mimgsize.c (main): use get_image_size()
From: Hiroyuki Ito <hito@crl.go.jp>
2002-07-22 16:17:32 +00:00