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

[w3m-dev 03352] w3mimgsize is not necessary.

Browse Source 
* XMakefile (IMGSIZE): removed
* config.h.dist (IMGSIZE): removed
* configure (imgtarget): remove IMGSIZE
	(config.h): remove IMGSIZE
* rc.c (CMT_IMGSIZE): removed
* doc/README.img: remove imgsize
* w3mimgsize.c: removed
From: Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
This commit is contained in:
Fumitoshi UKAI
2002-10-28 17:09:15 +00:00
parent 1cf8872ba1
commit e52ed1d5a5
7 changed files with 16 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
ChangeLog
View File

@@ -1,3 +1,14 @@
2002-10-29 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
* [w3m-dev 03352] w3mimgsize is not necessary.
* XMakefile (IMGSIZE): removed
* config.h.dist (IMGSIZE): removed
* configure (imgtarget): remove IMGSIZE
(config.h): remove IMGSIZE
* rc.c (CMT_IMGSIZE): removed
* doc/README.img: remove imgsize
* w3mimgsize.c: removed
2002-10-28 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
* [w3m-dev 03351] w3m core dump
@@ -4009,4 +4020,4 @@ a * [w3m-dev 03276] compile error on EWS4800
* release-0-2-1
* import w3m-0.2.1
$Id: ChangeLog,v 1.454 2002/10/28 04:53:07 ukai Exp $
$Id: ChangeLog,v 1.455 2002/10/28 17:09:15 ukai Exp $

10
XMakefile
View File

@@ -1,4 +1,4 @@
# $Id: XMakefile,v 1.28 2002/10/27 17:16:40 ukai Exp $
# $Id: XMakefile,v 1.29 2002/10/28 17:09:18 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)
@@ -19,7 +19,6 @@ BOOKMARKER=w3mbookmark$(EXT)
HELPER=w3mhelperpanel$(EXT)
INFLATE=inflate$(EXT)
IMGDISPLAY=w3mimgdisplay$(EXT)
IMGSIZE=w3mimgsize$(EXT)
MAN1=doc/w3m.1
MAN1_JA=doc-jp/w3m.1
TARGETS=$(TARGET) $(EXT_TARGETS)
@@ -96,16 +95,9 @@ $(IMGDISPLAY): w3mimgdisplay.o $(IMGOBJS)
$(CC) $(CFLAGS) $(IMGCFLAGS) $(LDFLAGS) -o $(IMGDISPLAY) \
w3mimgdisplay.o $(IMGOBJS) $(IMGLDFLAGS)
$(IMGSIZE): w3mimgsize.o $(IMGOBJS)
$(CC) $(CFLAGS) $(IMGCFLAGS) $(LDFLAGS) -o $(IMGSIZE) \
w3mimgsize.o $(IMGOBJS) $(IMGLDFLAGS)
w3mimgdisplay.o: w3mimgdisplay.c
$(CC) $(CFLAGS) $(IMGCFLAGS) -c w3mimgdisplay.c
w3mimgsize.o: w3mimgsize.c
$(CC) $(CFLAGS) $(IMGCFLAGS) -c w3mimgsize.c
w3mimg/w3mimg.o: w3mimg/w3mimg.c
cd w3mimg && $(CC) $(CFLAGS) $(IMGCFLAGS) -I.. -c w3mimg.c

1
config.h.dist
View File

@@ -155,7 +155,6 @@ MODEL=Linux.i686-monster-ja
#define HELP_FILE "w3mhelp.html"
#define HELP_CGI "w3mhelp"
#define W3MCONFIG "w3mconfig"
#define IMGSIZE "w3mimgsize"
#define IMGDISPLAY "w3mimgdisplay"
#define XFACE2XPM "xface2xpm"

5
configure vendored
View File

@@ -1,5 +1,5 @@
#!/bin/sh
# $Id: configure,v 1.80 2002/10/27 17:16:42 ukai Exp $
# $Id: configure,v 1.81 2002/10/28 17:09:20 ukai Exp $
# Configuration.
#
@@ -797,7 +797,7 @@ fi
ask_param "Inline image support" use_image n
if [ "$use_image" = y ]; then
def_use_image="#define USE_IMAGE"
imgtarget='$(IMGDISPLAY) $(IMGSIZE)'
imgtarget='$(IMGDISPLAY)'
ask_param "X11 inline image support (you need Imlib1 or GdkPixbuf library)" use_w3mimg_x11 y
d_w3mimg_fb=n
case $sysname in
@@ -2377,7 +2377,6 @@ $def_use_xface
#define HELP_FILE "w3mhelp.html"
#define HELP_CGI "w3mhelp"
#define W3MCONFIG "w3mconfig"
#define IMGSIZE "w3mimgsize"
#define IMGDISPLAY "w3mimgdisplay"
#define XFACE2XPM "xface2xpm"

2
doc/README.img
View File

@@ -76,8 +76,6 @@ Option panel
imgdisplay
External command to display image". The default value is "w3mimgdisplay".
See "Setting w3mimgdisplay".
imgsize
External command to get size of image. The default value is "w3mimgsize".
Required programs

4
rc.c
View File

@@ -1,4 +1,4 @@
/* $Id: rc.c,v 1.53 2002/10/27 16:59:33 ukai Exp $ */
/* $Id: rc.c,v 1.54 2002/10/28 17:09:29 ukai Exp $ */
/*
* Initialization file etc.
*/
@@ -74,7 +74,6 @@ static char *config_file = NULL;
#define CMT_EXT_IMAGE_VIEWER "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ӥ塼<D3A5><E5A1BC><EFBFBD><EFBFBD>ɽ<EFBFBD><C9BD>"
#define CMT_IMAGE_SCALE "<22><><EFBFBD><EFBFBD><EFBFBD>Υ<EFBFBD><CEA5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>(%)"
#define CMT_IMGDISPLAY "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ɽ<EFBFBD><C9BD><EFBFBD><EFBFBD><EFBFBD>뤿<EFBFBD><EBA4BF><EFBFBD>Υ<EFBFBD><CEA5>ޥ<EFBFBD><DEA5><EFBFBD>"
#define CMT_IMGSIZE "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>礭<EFBFBD><E7A4AD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>뤿<EFBFBD><EBA4BF><EFBFBD>Υ<EFBFBD><CEA5>ޥ<EFBFBD><DEA5><EFBFBD>"
#endif
#define CMT_MULTICOL "<22>ե<EFBFBD><D5A5><EFBFBD><EFBFBD><EFBFBD>̾<EFBFBD>Υޥ<CEA5><DEA5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ɽ<EFBFBD><C9BD>"
#define CMT_ALT_ENTITY "<22><><EFBFBD><EFBFBD><EFBFBD>ƥ<EFBFBD><C6A5>ƥ<EFBFBD><C6A5><EFBFBD> ASCII <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ɽ<EFBFBD><C9BD><EFBFBD><EFBFBD>ɽ<EFBFBD><C9BD>"
@@ -217,7 +216,6 @@ static char *config_file = NULL;
#define CMT_EXT_IMAGE_VIEWER "Use external image viewer"
#define CMT_IMAGE_SCALE "Scale of image (%)"
#define CMT_IMGDISPLAY "External command to display image"
#define CMT_IMGSIZE "External command to get size of image"
#endif
#define CMT_MULTICOL "Display file names in multi-column format"
#define CMT_ALT_ENTITY "Use ASCII equivalents to display entities"

29
w3mimgsize.c
View File

@@ -1,29 +0,0 @@
/* $Id: w3mimgsize.c,v 1.3 2002/07/22 16:17:32 ukai Exp $ */
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include "config.h"
#include "w3mimg/w3mimg.h"
int
main(int argc, char **argv)
{
w3mimg_op *w_op = NULL;
W3MImage img;
int w, h;
fclose(stderr);
if (argc < 2)
exit(1);
w_op = w3mimg_open();
if (w_op == NULL)
exit(1);
if (!w_op->init(w_op))
exit(1);
if (!w_op->get_image_size(w_op, &img, argv[1], &w, &h))
exit(1);
printf("%d %d\n", w, h);
exit(0);
}