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

* funcname.tab: generated from DEFUN

Browse Source 
* main.c menu.c: use DEFUN
This commit is contained in:
Fumitoshi UKAI
2003-09-26 20:45:53 +00:00
parent eb5aa3e915
commit 28bc348680
6 changed files with 161 additions and 285 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.cvsignore
+1
View File
@@ -5,6 +5,7 @@ config.log
config.status config.status
config.h config.h
config.param config.param
funcname.tab
funcname.c funcname.c
funcname1.h funcname1.h
funcname2.h funcname2.h
ChangeLog
+3 -1
View File
@@ -1,5 +1,7 @@
2003-09-27 Fumitoshi UKAI <ukai@debian.or.jp> 2003-09-27 Fumitoshi UKAI <ukai@debian.or.jp>
* funcname.tab: generated from DEFUN
* main.c menu.c: use DEFUN
* conv.c ucs_eucjp.h ucs_latin1.h: deleted * conv.c ucs_eucjp.h ucs_latin1.h: deleted
2003-09-26 Fumitoshi UKAI <ukai@debian.or.jp> 2003-09-26 Fumitoshi UKAI <ukai@debian.or.jp>
@@ -8101,4 +8103,4 @@ a * [w3m-dev 03276] compile error on EWS4800
* release-0-2-1 * release-0-2-1
* import w3m-0.2.1 * import w3m-0.2.1
$Id: ChangeLog,v 1.873 2003/09/26 16:57:27 ukai Exp $ $Id: ChangeLog,v 1.874 2003/09/26 20:45:53 ukai Exp $
Makefile.in
+10 -4
View File
@@ -61,6 +61,7 @@ IMGLDFLAGS = @IMGX11LDFLAGS@ @IMGFBLDFLAGS@
CC0 = @CC@ CC0 = @CC@
CC = @POSUBST@ $(CC0) CC = @POSUBST@ $(CC0)
CPP = @CPP@
RANLIB=@RANLIB@ RANLIB=@RANLIB@
AWK = @AWK@ AWK = @AWK@
PERL = @PERL@ PERL = @PERL@
@@ -138,17 +139,21 @@ keybind.o: funcname2.h
keybind_lynx.o: funcname2.h keybind_lynx.o: funcname2.h
parsetagx.o: html.c parsetagx.o: html.c
funcname.tab: main.c menu.c
(echo '#define DEFUN(x,y,z) x y'; grep -h '^DEFUN' $^) | $(CPP) - | \
awk '$$1 ~ /^[_A-Za-z]/ { for (i=2;i<=NF;i++) { print $$i, $$1} }' > $@
funcname.c: funcname.tab funcname.c: funcname.tab
sort $(srcdir)/funcname.tab | $(AWK) -f $(top_srcdir)/funcname0.awk > $@ sort funcname.tab | $(AWK) -f $(top_srcdir)/funcname0.awk > $@
funcname1.h: funcname.tab funcname1.h: funcname.tab
sort $(srcdir)/funcname.tab | $(AWK) -f $(top_srcdir)/funcname1.awk > $@ sort funcname.tab | $(AWK) -f $(top_srcdir)/funcname1.awk > $@
funcname2.h: funcname.tab funcname2.h: funcname.tab
sort $(srcdir)/funcname.tab | $(AWK) -f $(top_srcdir)/funcname2.awk > $@ sort funcname.tab | $(AWK) -f $(top_srcdir)/funcname2.awk > $@
functable.c: funcname.tab mktable$(EXT) functable.c: funcname.tab mktable$(EXT)
sort $(srcdir)/funcname.tab | $(AWK) -f $(top_srcdir)/functable.awk > functable.tab sort funcname.tab | $(AWK) -f $(top_srcdir)/functable.awk > functable.tab
./mktable$(EXT) 100 functable.tab > $@ ./mktable$(EXT) 100 functable.tab > $@
-rm -f functable.tab -rm -f functable.tab
@@ -260,6 +265,7 @@ uninstall:
clean: sweep clean: sweep
-$(RM) -f *.o *.a $(TARGETS) mktable$(EXT) -$(RM) -f *.o *.a $(TARGETS) mktable$(EXT)
-$(RM) -f funcname.tab
-$(RM) -f funcname.c funcname1.h funcname2.h tagtable.c functable.c -$(RM) -f funcname.c funcname1.h funcname2.h tagtable.c functable.c
-for dir in w3mimg libwc; \ -for dir in w3mimg libwc; \
do \ do \
fm.h
+3 -1
View File
@@ -1,4 +1,4 @@
/* $Id: fm.h,v 1.122 2003/09/24 18:48:59 ukai Exp $ */ /* $Id: fm.h,v 1.123 2003/09/26 20:45:53 ukai Exp $ */
/* /*
* w3m: WWW wo Miru utility * w3m: WWW wo Miru utility
* *
@@ -94,6 +94,8 @@ void bzero(void *, int);
#define init(x) #define init(x)
#endif /* not MAINPROGRAM */ #endif /* not MAINPROGRAM */
#define DEFUN(funcname, macroname, docstring) void funcname(void)
/* /*
* Constants. * Constants.
*/ */
main.c
+139 -271
View File
File diff suppressed because it is too large Load Diff
menu.c
+5 -8
View File
@@ -1,4 +1,4 @@
/* $Id: menu.c,v 1.39 2003/09/25 18:09:01 ukai Exp $ */ /* $Id: menu.c,v 1.40 2003/09/26 20:45:53 ukai Exp $ */
/* /*
* w3m menu.c * w3m menu.c
*/ */
@@ -258,7 +258,7 @@ static int smDelTab(char c);
static Menu MainMenu; static Menu MainMenu;
#ifdef USE_M17N #ifdef USE_M17N
/* FIXME: gettextize here */ /* FIXME: gettextize here */
static wc_ces MainMenuCharset = WC_CES_US_ASCII; /* FIXME: charset of source code */ static wc_ces MainMenuCharset = WC_CES_US_ASCII; /* FIXME: charset of source code */
static int MainMenuEncode = FALSE; static int MainMenuEncode = FALSE;
#endif #endif
@@ -1302,8 +1302,7 @@ mainMenu(int x, int y)
popupMenu(x, y, &MainMenu); popupMenu(x, y, &MainMenu);
} }
void DEFUN(mainMn, MAIN_MENU MENU, "Popup menu")
mainMn(void)
{ {
Menu *menu = &MainMenu; Menu *menu = &MainMenu;
char *data; char *data;
@@ -1331,8 +1330,7 @@ mainMn(void)
/* --- SelectMenu --- */ /* --- SelectMenu --- */
void DEFUN(selMn, SELECT_MENU, "Popup buffer selection menu")
selMn(void)
{ {
int x = Currentbuf->cursorX + Currentbuf->rootX, int x = Currentbuf->cursorX + Currentbuf->rootX,
y = Currentbuf->cursorY + Currentbuf->rootY; y = Currentbuf->cursorY + Currentbuf->rootY;
@@ -1479,8 +1477,7 @@ smDelBuf(char c)
/* --- SelTabMenu --- */ /* --- SelTabMenu --- */
void DEFUN(tabMn, TAB_MENU, "Popup tab selection menu")
tabMn(void)
{ {
int x = Currentbuf->cursorX + Currentbuf->rootX, int x = Currentbuf->cursorX + Currentbuf->rootX,
y = Currentbuf->cursorY + Currentbuf->rootY; y = Currentbuf->cursorY + Currentbuf->rootY;