w3mimgdisplay supports Windows console (http://www.j10n.org/files/w3m-cvs-1.1040-misc.patch).
This commit is contained in:
@@ -11,10 +11,11 @@ AR=ar
|
||||
RANLIB=@RANLIB@
|
||||
RM=rm
|
||||
|
||||
IMGCFLAGS=@IMGX11CFLAGS@ @IMGFBCFLAGS@
|
||||
SUBDIRS=fb x11 win
|
||||
IMGCFLAGS=@IMGX11CFLAGS@ @IMGFBCFLAGS@ @IMGWINCFLAGS@
|
||||
IMGOBJS=@IMGOBJS@
|
||||
|
||||
.PHONY: fb x11
|
||||
.PHONY: $(SUBDIRS)
|
||||
all: @IMGTARGETS@ w3mimg.a
|
||||
|
||||
w3mimg.a: $(IMGOBJS)
|
||||
@@ -24,18 +25,18 @@ w3mimg.a: $(IMGOBJS)
|
||||
w3mimg.o: w3mimg.c
|
||||
$(CC) $(CFLAGS) -c $<
|
||||
|
||||
fb x11:
|
||||
$(SUBDIRS):
|
||||
cd $@ && $(MAKE) CC="$(CC)" OPTS="$(OPTS)"
|
||||
|
||||
clean:
|
||||
@-$(RM) -f *.o
|
||||
@for dir in fb x11; do \
|
||||
@for dir in $(SUBDIRS); do \
|
||||
(cd $$dir && $(MAKE) clean RM=$(RM)); \
|
||||
done
|
||||
-$(RM) -f w3mimg.a
|
||||
|
||||
distclean: clean
|
||||
for subdir in fb x11; \
|
||||
for subdir in $(SUBDIRS); \
|
||||
do \
|
||||
(cd $$subdir && $(MAKE) distclean); \
|
||||
done
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
/* $Id: w3mimg.c,v 1.5 2002/11/06 03:50:49 ukai Exp $ */
|
||||
/* $Id: w3mimg.c,v 1.6 2010/12/21 10:13:55 htrb Exp $ */
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
@@ -14,6 +14,10 @@ w3mimg_open()
|
||||
uid_t runner_uid = getuid();
|
||||
uid_t owner_uid = geteuid();
|
||||
#endif
|
||||
#ifdef USE_W3MIMG_WIN
|
||||
if (w_op == NULL)
|
||||
w_op = w3mimg_winopen();
|
||||
#endif
|
||||
#ifdef USE_W3MIMG_X11
|
||||
#ifdef W3MIMGDISPLAY_SETUID
|
||||
/* run in user privileges */
|
||||
|
||||
@@ -1,6 +1,13 @@
|
||||
/* $Id: w3mimg.h,v 1.8 2003/07/13 16:19:10 ukai Exp $ */
|
||||
/* $Id: w3mimg.h,v 1.9 2010/12/21 10:13:55 htrb Exp $ */
|
||||
#ifndef W3MIMG_W3MIMG_H
|
||||
#define W3MIMG_W3MIMG_H
|
||||
|
||||
#include "config.h"
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
#ifdef USE_W3MIMG_FB
|
||||
#include "w3mimg/fb/fb.h"
|
||||
#include "w3mimg/fb/fb_img.h"
|
||||
@@ -42,5 +49,13 @@ extern w3mimg_op *w3mimg_x11open();
|
||||
#ifdef USE_W3MIMG_FB
|
||||
extern w3mimg_op *w3mimg_fbopen();
|
||||
#endif
|
||||
#ifdef USE_W3MIMG_WIN
|
||||
extern w3mimg_op *w3mimg_winopen();
|
||||
#endif
|
||||
|
||||
extern w3mimg_op *w3mimg_open();
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
#endif /* W3MIMG_W3MIMG_H */
|
||||
|
||||
31
w3mimg/win/Makefile.in
Normal file
31
w3mimg/win/Makefile.in
Normal file
@@ -0,0 +1,31 @@
|
||||
#
|
||||
# w3mimg/win/Makefile
|
||||
#
|
||||
#
|
||||
@SET_MAKE@
|
||||
SHELL=@SHELL@
|
||||
srcdir = @srcdir@
|
||||
top_srcdir = @top_srcdir@
|
||||
VPATH = $(srcdir):.
|
||||
CFLAGS=$(OPTS) -I../.. -I$(top_srcdir) -I$(srcdir) @CFLAGS@ @CPPFLAGS@ @DEFS@ $(IMGCFLAGS)
|
||||
RM=rm
|
||||
CC=@CC@
|
||||
CXX=@CXX@
|
||||
|
||||
IMGCFLAGS=@IMGWINCFLAGS@
|
||||
OBJS=win_w3mimg.o
|
||||
|
||||
all: win_w3mimg.o
|
||||
|
||||
win_w3mimg.o: win_w3mimg.cpp
|
||||
$(CXX) $(CFLAGS) -c $<
|
||||
|
||||
clean:
|
||||
@-$(RM) -f *.o
|
||||
|
||||
distclean: clean
|
||||
-$(RM) -f Makefile
|
||||
|
||||
#
|
||||
|
||||
|
||||
1063
w3mimg/win/win_w3mimg.cpp
Normal file
1063
w3mimg/win/win_w3mimg.cpp
Normal file
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user