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

fix indent

Browse Source
This commit is contained in:
Fumitoshi UKAI
2003-09-26 20:58:51 +00:00
parent 82cbecec07
commit 1ce0d7fe50
3 changed files with 180 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile.in
+7 -4
View File
@@ -140,8 +140,11 @@ keybind_lynx.o: funcname2.h
parsetagx.o: html.c parsetagx.o: html.c
funcname.tab: main.c menu.c funcname.tab: main.c menu.c
(echo '#define DEFUN(x,y,z) x y'; grep -h '^DEFUN' $^) | $(CPP) - | \ (echo '#define DEFUN(x,y,z) x y';\
awk '$$1 ~ /^[_A-Za-z]/ { for (i=2;i<=NF;i++) { print $$i, $$1} }' > $@ sed -ne '/^DEFUN/{p;n;/^[ ]/p;}' $^) | $(CPP) - | \
awk '$$1 ~ /^[_A-Za-z]/ { \
for (i=2;i<=NF;i++) { print $$i, $$1} \
}' > $@
funcname.c: funcname.tab funcname.c: funcname.tab
sort funcname.tab | $(AWK) -f $(top_srcdir)/funcname0.awk > $@ sort funcname.tab | $(AWK) -f $(top_srcdir)/funcname0.awk > $@
@@ -153,7 +156,7 @@ funcname2.h: funcname.tab
sort 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 funcname.tab | $(AWK) -f $(top_srcdir)/functable.awk > functable.tab sort funcname.tab | $(AWK) -f $(top_srcdir)/functable.awk > functable.ta b
./mktable$(EXT) 100 functable.tab > $@ ./mktable$(EXT) 100 functable.tab > $@
-rm -f functable.tab -rm -f functable.tab
@@ -164,7 +167,7 @@ $(BOOKMARKER): w3mbookmark.o dummy.o $(ALIB)
$(CC) $(CFLAGS) -o $(BOOKMARKER) w3mbookmark.o dummy.o $(LDFLAGS) $(LIBS) $(CC) $(CFLAGS) -o $(BOOKMARKER) w3mbookmark.o dummy.o $(LDFLAGS) $(LIBS)
$(HELPER): w3mhelperpanel.o dummy.o $(ALIB) $(HELPER): w3mhelperpanel.o dummy.o $(ALIB)
$(CC) $(CFLAGS) -o $(HELPER) w3mhelperpanel.o dummy.o $(LDFLAGS) $(LIBS) $(CC) $(CFLAGS) -o $(HELPER) w3mhelperpanel.o dummy.o $(LDFLAGS) $(LIBS)
$(INFLATE): inflate.o $(INFLATE): inflate.o
$(CC) $(CFLAGS) -o $(INFLATE) inflate.o $(LDFLAGS) $(LIBS) -lz $(CC) $(CFLAGS) -o $(INFLATE) inflate.o $(LDFLAGS) $(LIBS) -lz
funcname.tab
+149 -152
View File
@@ -1,153 +1,150 @@
# $Id: funcname.tab,v 1.22 2003/09/22 21:02:18 ukai Exp $ NOTHING nulcmd
# macro name function name NULL nulcmd
#---------------------------- @@@ nulcmd
@@@ nulcmd PCMAP pcmap
ABORT quitfm ESCMAP escmap
ACCESSKEY accessKey ESCBMAP escbmap
ADD_BOOKMARK adBmark MULTIMAP multimap
ALARM setAlarm NEXT_PAGE pgFore
BACK backBf PREV_PAGE pgBack
BEGIN goLineF UP lup1
BOOKMARK ldBmark DOWN ldown1
CENTER_H ctrCsrH CENTER_V ctrCsrV
CENTER_V ctrCsrV CENTER_H ctrCsrH
CHARSET docCSet REDRAW rdrwSc
CLOSE_TAB closeT SEARCH srchfor
CLOSE_TAB_MOUSE closeTMs SEARCH_FORE srchfor
COMMAND execCmd WHEREIS srchfor
COOKIE cooLst ISEARCH isrchfor
DEFAULT_CHARSET defCSet SEARCH_BACK srchbak
DEFINE_KEY defKey ISEARCH_BACK isrchbak
DELETE_PREVBUF deletePrevBuf SEARCH_NEXT srchnxt
DICT_WORD dictword SEARCH_PREV srchprv
DICT_WORD_AT dictwordat SHIFT_LEFT shiftl
DISPLAY_IMAGE dispI SHIFT_RIGHT shiftr
DOWN ldown1 RIGHT col1R
DOWNLOAD svSrc LEFT col1L
DOWNLOAD_LIST ldDL SETENV setEnv
EDIT editBf PIPE_BUF pipeBuf
EDIT_SCREEN editScr PIPE_SHELL pipesh
END goLineL READ_SHELL readsh
ESCBMAP escbmap EXEC_SHELL execsh
ESCMAP escmap SHELL execsh
EXEC_SHELL execsh LOAD ldfile
EXIT quitfm HELP ldhelp
EXTERN extbrz MOVE_LEFT movL
EXTERN_LINK linkbrz MOVE_LEFT1 movL1
FRAME rFrame MOVE_DOWN movD
GOTO goURL MOVE_DOWN1 movD1
GOTO_LINE goLine MOVE_UP movU
GOTO_LINK followA MOVE_UP1 movU1
GOTO_RELATIVE gorURL MOVE_RIGHT movR
HELP ldhelp MOVE_RIGHT1 movR1
HISTORY ldHist PREV_WORD movLW
INFO pginfo NEXT_WORD movRW
INTERRUPT susp ABORT quitfm
ISEARCH isrchfor EXIT quitfm
ISEARCH_BACK isrchbak QUIT qquitfm
LEFT col1L SELECT selBuf
LINE_BEGIN linbeg INTERRUPT susp
LINE_END linend SUSPEND susp
LINE_INFO curlno GOTO_LINE goLine
LINK_BEGIN topA BEGIN goLineF
LINK_END lastA END goLineL
LINK_MENU linkMn LINE_BEGIN linbeg
LIST linkLst LINE_END linend
LIST_MENU listMn EDIT editBf
LOAD ldfile EDIT_SCREEN editScr
MAIN_MENU mainMn MARK _mark
MARK _mark NEXT_MARK nextMk
MARK_MID chkNMID PREV_MARK prevMk
MARK_URL chkURL REG_MARK reMark
MARK_WORD chkWORD GOTO_LINK followA
MENU mainMn VIEW_IMAGE followI
MENU_MOUSE menuMs SUBMIT submitForm
MOUSE mouse LINK_BEGIN topA
MOUSE_TOGGLE msToggle LINK_END lastA
MOVE_DOWN movD NEXT_LINK nextA
MOVE_DOWN1 movD1 PREV_LINK prevA
MOVE_LEFT movL NEXT_VISITED nextVA
MOVE_LEFT1 movL1 PREV_VISITED prevVA
MOVE_LIST_MENU movlistMn NEXT_LEFT nextL
MOVE_MOUSE movMs NEXT_LEFT_UP nextLU
MOVE_RIGHT movR NEXT_RIGHT nextR
MOVE_RIGHT1 movR1 NEXT_RIGHT_DOWN nextRD
MOVE_UP movU NEXT_DOWN nextD
MOVE_UP1 movU1 NEXT_UP nextU
MSGS msgs NEXT nextBf
MULTIMAP multimap PREV prevBf
NEW_TAB newT BACK backBf
NEXT nextBf DELETE_PREVBUF deletePrevBuf
NEXT_DOWN nextD GOTO goURL
NEXT_LEFT nextL GOTO_RELATIVE gorURL
NEXT_LEFT_UP nextLU BOOKMARK ldBmark
NEXT_LINK nextA VIEW_BOOKMARK ldBmark
NEXT_MARK nextMk ADD_BOOKMARK adBmark
NEXT_PAGE pgFore OPTIONS ldOpt
NEXT_RIGHT nextR SET_OPTION setOpt
NEXT_RIGHT_DOWN nextRD MSGS msgs
NEXT_TAB nextT INFO pginfo
NEXT_UP nextU LINK_MENU linkMn
NEXT_WORD movRW ACCESSKEY accessKey
NOTHING nulcmd LIST_MENU listMn
NULL nulcmd MOVE_LIST_MENU movlistMn
OPTIONS ldOpt LIST linkLst
PCMAP pcmap COOKIE cooLst
PEEK curURL HISTORY ldHist
PEEK_IMG peekIMG SAVE_LINK svA
PEEK_LINK peekURL SAVE_IMAGE svI
PIPE_BUF pipeBuf PRINT svBuf
PIPE_SHELL pipesh SAVE_SCREEN svBuf
PREV prevBf DOWNLOAD svSrc
PREV_LINK prevA SAVE svSrc
PREV_MARK prevMk PEEK_LINK peekURL
PREV_PAGE pgBack PEEK_IMG peekIMG
PREV_TAB prevT PEEK curURL
PREV_WORD movLW SOURCE vwSrc
PRINT svBuf VIEW vwSrc
QUIT qquitfm RELOAD reload
READ_SHELL readsh RESHAPE reshape
REDO redoPos CHARSET docCSet
REDRAW rdrwSc DEFAULT_CHARSET defCSet
REG_MARK reMark MARK_URL chkURL
REINIT reinit MARK_WORD chkWORD
RELOAD reload MARK_MID chkNMID
RESHAPE reshape FRAME rFrame
RIGHT col1R EXTERN extbrz
SAVE svSrc EXTERN_LINK linkbrz
SAVE_IMAGE svI LINE_INFO curlno
SAVE_LINK svA DISPLAY_IMAGE dispI
SAVE_SCREEN svBuf STOP_IMAGE stopI
SEARCH srchfor MOUSE_TOGGLE msToggle
SEARCH_BACK srchbak MOUSE mouse
SEARCH_FORE srchfor MOVE_MOUSE movMs
SEARCH_NEXT srchnxt MENU_MOUSE menuMs
SEARCH_PREV srchprv TAB_MOUSE tabMs
SELECT selBuf CLOSE_TAB_MOUSE closeTMs
SELECT_MENU selMn
SETENV setEnv
SET_OPTION setOpt
SHELL execsh
SHIFT_LEFT shiftl
SHIFT_RIGHT shiftr
SOURCE vwSrc
STOP_IMAGE stopI
SUBMIT submitForm
SUSPEND susp
TAB_GOTO tabURL
TAB_GOTO_RELATIVE tabrURL
TAB_LEFT tabL
TAB_LINK tabA
TAB_MENU tabMn
TAB_MOUSE tabMs
TAB_RIGHT tabR
UNDO undoPos
UP lup1
VERSION dispVer VERSION dispVer
VIEW vwSrc WRAP_TOGGLE wrapToggle
VIEW_BOOKMARK ldBmark DICT_WORD dictword
VIEW_IMAGE followI DICT_WORD_AT dictwordat
WHEREIS srchfor COMMAND execCmd
WRAP_TOGGLE wrapToggle ALARM setAlarm
NEXT_VISITED nextVA REINIT reinit
PREV_VISITED prevVA DEFINE_KEY defKey
NEW_TAB newT
CLOSE_TAB closeT
NEXT_TAB nextT
PREV_TAB prevT
TAB_LINK tabA
TAB_GOTO tabURL
TAB_GOTO_RELATIVE tabrURL
TAB_RIGHT tabR
TAB_LEFT tabL
DOWNLOAD_LIST ldDL
UNDO undoPos
REDO redoPos
MAIN_MENU mainMn
MENU mainMn
SELECT_MENU selMn
TAB_MENU tabMn
main.c
+24 -13
View File
@@ -1,4 +1,4 @@
/* $Id: main.c,v 1.236 2003/09/26 20:45:53 ukai Exp $ */ /* $Id: main.c,v 1.237 2003/09/26 20:58:51 ukai Exp $ */
#define MAINPROGRAM #define MAINPROGRAM
#include "fm.h" #include "fm.h"
#include <signal.h> #include <signal.h>
@@ -1232,7 +1232,7 @@ do_dump(Buffer *buf)
mySignal(SIGINT, prevtrap); mySignal(SIGINT, prevtrap);
} }
DEFUN(nulcmd, @@@ NOTHING NULL, "Do nothing") DEFUN(nulcmd, NOTHING NULL @@@, "Do nothing")
{ /* do nothing */ { /* do nothing */
} }
@@ -2130,7 +2130,8 @@ _movL(int n)
displayBuffer(Currentbuf, B_NORMAL); displayBuffer(Currentbuf, B_NORMAL);
} }
DEFUN(movL, MOVE_LEFT, "Move cursor left (a half screen shift at the left edge)") DEFUN(movL, MOVE_LEFT,
"Move cursor left (a half screen shift at the left edge)")
{ {
_movL(Currentbuf->COLS / 2); _movL(Currentbuf->COLS / 2);
} }
@@ -2152,12 +2153,14 @@ _movD(int n)
displayBuffer(Currentbuf, B_NORMAL); displayBuffer(Currentbuf, B_NORMAL);
} }
DEFUN(movD, MOVE_DOWN, "Move cursor down (a half screen scroll at the end of screen)") DEFUN(movD, MOVE_DOWN,
"Move cursor down (a half screen scroll at the end of screen)")
{ {
_movD((Currentbuf->LINES + 1) / 2); _movD((Currentbuf->LINES + 1) / 2);
} }
DEFUN(movD1, MOVE_DOWN1, "Move cursor down (1 line scroll at the end of screen)") DEFUN(movD1, MOVE_DOWN1,
"Move cursor down (1 line scroll at the end of screen)")
{ {
_movD(1); _movD(1);
} }
@@ -2174,7 +2177,8 @@ _movU(int n)
displayBuffer(Currentbuf, B_NORMAL); displayBuffer(Currentbuf, B_NORMAL);
} }
DEFUN(movU, MOVE_UP, "Move cursor up (a half screen scroll at the top of screen)") DEFUN(movU, MOVE_UP,
"Move cursor up (a half screen scroll at the top of screen)")
{ {
_movU((Currentbuf->LINES + 1) / 2); _movU((Currentbuf->LINES + 1) / 2);
} }
@@ -2196,12 +2200,14 @@ _movR(int n)
displayBuffer(Currentbuf, B_NORMAL); displayBuffer(Currentbuf, B_NORMAL);
} }
DEFUN(movR, MOVE_RIGHT, "Move cursor right (a half screen shift at the right edge)") DEFUN(movR, MOVE_RIGHT,
"Move cursor right (a half screen shift at the right edge)")
{ {
_movR(Currentbuf->COLS / 2); _movR(Currentbuf->COLS / 2);
} }
DEFUN(movR1, MOVE_RIGHT1, "Move cursor right (1 columns shift at the right edge)") DEFUN(movR1, MOVE_RIGHT1,
"Move cursor right (1 columns shift at the right edge)")
{ {
_movR(1); _movR(1);
} }
@@ -3930,7 +3936,8 @@ DEFUN(backBf, BACK, "Back to previous buffer")
displayBuffer(Currentbuf, B_FORCE_REDRAW); displayBuffer(Currentbuf, B_FORCE_REDRAW);
} }
DEFUN(deletePrevBuf, DELETE_PREVBUF, "Delete previous buffer (mainly for local-CGI)") DEFUN(deletePrevBuf, DELETE_PREVBUF,
"Delete previous buffer (mainly for local-CGI)")
{ {
Buffer *buf = Currentbuf->nextBuffer; Buffer *buf = Currentbuf->nextBuffer;
if (buf) if (buf)
@@ -4289,7 +4296,8 @@ DEFUN(listMn, LIST_MENU, "Popup link list menu and go to selected link")
anchorMn(list_menu, TRUE); anchorMn(list_menu, TRUE);
} }
DEFUN(movlistMn, MOVE_LIST_MENU, "Popup link list menu and move cursor to selected link") DEFUN(movlistMn, MOVE_LIST_MENU,
"Popup link list menu and move cursor to selected link")
{ {
anchorMn(list_menu, FALSE); anchorMn(list_menu, FALSE);
} }
@@ -5444,7 +5452,8 @@ DEFUN(tabMs, TAB_MOUSE, "Move to tab on mouse cursor (for mouse action)")
displayBuffer(Currentbuf, B_FORCE_REDRAW); displayBuffer(Currentbuf, B_FORCE_REDRAW);
} }
DEFUN(closeTMs, CLOSE_TAB_MOUSE, "Close tab on mouse cursor (for mouse action)") DEFUN(closeTMs, CLOSE_TAB_MOUSE,
"Close tab on mouse cursor (for mouse action)")
{ {
TabBuffer *tab; TabBuffer *tab;
@@ -5563,7 +5572,8 @@ DEFUN(dictword, DICT_WORD, "Execute dictionary command (see README.dict)")
execdict(inputStr("(dictionary)!", "")); execdict(inputStr("(dictionary)!", ""));
} }
DEFUN(dictwordat, DICT_WORD_AT, "Execute dictionary command for word at cursor") DEFUN(dictwordat, DICT_WORD_AT,
"Execute dictionary command for word at cursor")
{ {
execdict(GetWord(Currentbuf)); execdict(GetWord(Currentbuf));
} }
@@ -5909,7 +5919,8 @@ DEFUN(reinit, REINIT, "Reload configuration files")
ptr, FALSE); ptr, FALSE);
} }
DEFUN(defKey, DEFINE_KEY, "Define a binding between a key stroke and a user command") DEFUN(defKey, DEFINE_KEY,
"Define a binding between a key stroke and a user command")
{ {
char *data; char *data;