diff options
author | Fumitoshi UKAI <ukai@debian.or.jp> | 2002-11-25 16:59:07 +0000 |
---|---|---|
committer | Fumitoshi UKAI <ukai@debian.or.jp> | 2002-11-25 16:59:07 +0000 |
commit | 769c92bf7e75d3a5a29c6d2d2a5f5ca68a4adcd6 (patch) | |
tree | 69b391ce819740174d6c8a8d9130b1e031108a1d | |
parent | [w3m-dev 03478] mouse action configuration (diff) | |
download | w3m-769c92bf7e75d3a5a29c6d2d2a5f5ca68a4adcd6.tar.gz w3m-769c92bf7e75d3a5a29c6d2d2a5f5ca68a4adcd6.zip |
fix indent
-rw-r--r-- | file.c | 16 | ||||
-rw-r--r-- | func.c | 44 | ||||
-rw-r--r-- | main.c | 18 |
3 files changed, 39 insertions, 39 deletions
@@ -1,4 +1,4 @@ -/* $Id: file.c,v 1.128 2002/11/25 16:39:52 ukai Exp $ */ +/* $Id: file.c,v 1.129 2002/11/25 16:59:07 ukai Exp $ */ #include "fm.h" #include <sys/types.h> #include "myctype.h" @@ -5454,7 +5454,7 @@ HTMLlineproc0(char *str, struct html_feed_environ *h_env, int internal) } if (ST_IS_COMMENT(obuf->status)) { if ((obuf->table_level >= 0) ? tbl_mode->pre_mode & TBLM_IGNORE - : obuf->flag & RB_IGNORE) + : obuf->flag & RB_IGNORE) /* within ignored tag, such as * * <script>..</script>, don't process comment. */ obuf->status = R_ST_NORMAL; @@ -5470,12 +5470,12 @@ HTMLlineproc0(char *str, struct html_feed_environ *h_env, int internal) Strcat_char(h_env->tagbuf, ' '); } if ((obuf->table_level >= 0) - ? ((tbl_mode->pre_mode & TBLM_IGNORE) && - !TAG_IS(h_env->tagbuf->ptr, tbl_mode->ignore_tag->ptr, - tbl_mode->ignore_tag->length - 1)) - : ((obuf->flag & RB_IGNORE) && - !TAG_IS(h_env->tagbuf->ptr, obuf->ignore_tag->ptr, - obuf->ignore_tag->length - 1))) + ? ((tbl_mode->pre_mode & TBLM_IGNORE) && + !TAG_IS(h_env->tagbuf->ptr, tbl_mode->ignore_tag->ptr, + tbl_mode->ignore_tag->length - 1)) + : ((obuf->flag & RB_IGNORE) && + !TAG_IS(h_env->tagbuf->ptr, obuf->ignore_tag->ptr, + obuf->ignore_tag->length - 1))) /* within ignored tag, such as * * <script>..</script>, don't process tag. */ obuf->status = R_ST_NORMAL; @@ -1,4 +1,4 @@ -/* $Id: func.c,v 1.15 2002/11/25 16:57:17 ukai Exp $ */ +/* $Id: func.c,v 1.16 2002/11/25 16:59:07 ukai Exp $ */ /* * w3m func.c */ @@ -323,31 +323,31 @@ getQWord(char **str) #ifdef USE_MOUSE static MouseAction default_mouse_action = { - NULL, + NULL, #if LANG == JA - "ΆγΆ¬Ά", + "ΆγΆ¬Ά", #else - "<=UpDn", + "<=UpDn", #endif - 0, 6, FALSE, 0, 0, - { { movMs, NULL }, { backBf, NULL }, { menuMs, NULL } }, /* default */ - { { NULL, NULL }, { NULL, NULL }, { NULL, NULL } }, /* anchor */ - { { followA, NULL }, { NULL, NULL }, { NULL, NULL } }, /* active */ - { { tabMs, NULL }, { closeTMs, NULL }, { NULL, NULL } }, /* tab */ - { NULL, NULL, NULL }, /* menu */ - { NULL, NULL, NULL } /* lastline */ + 0, 6, FALSE, 0, 0, + {{movMs, NULL}, {backBf, NULL}, {menuMs, NULL}}, /* default */ + {{NULL, NULL}, {NULL, NULL}, {NULL, NULL}}, /* anchor */ + {{followA, NULL}, {NULL, NULL}, {NULL, NULL}}, /* active */ + {{tabMs, NULL}, {closeTMs, NULL}, {NULL, NULL}}, /* tab */ + {NULL, NULL, NULL}, /* menu */ + {NULL, NULL, NULL} /* lastline */ }; static MouseActionMap default_lastline_action[6] = { - { backBf, NULL }, - { backBf, NULL }, - { pgBack, NULL }, - { pgBack, NULL }, - { pgFore, NULL }, - { pgFore, NULL } + {backBf, NULL}, + {backBf, NULL}, + {pgBack, NULL}, + {pgBack, NULL}, + {pgFore, NULL}, + {pgFore, NULL} }; static void -setMouseAction0(char **str, int *width, MouseActionMap **map, char *p) +setMouseAction0(char **str, int *width, MouseActionMap ** map, char *p) { char *s; int b, w, x; @@ -379,7 +379,7 @@ setMouseAction0(char **str, int *width, MouseActionMap **map, char *p) } static void -setMouseAction1(MouseActionMap **map, int width, char *p) +setMouseAction1(MouseActionMap ** map, int width, char *p) { char *s; int x, x2, f; @@ -394,11 +394,11 @@ setMouseAction1(MouseActionMap **map, int width, char *p) s = getWord(&p); x = atoi(s); if (!(IS_DIGIT(*s) && x >= 0 && x < width)) - return; /* error */ + return; /* error */ s = getWord(&p); x2 = atoi(s); if (!(IS_DIGIT(*s) && x2 >= 0 && x2 < width)) - return; /* error */ + return; /* error */ s = getWord(&p); f = getFuncList(s); s = getQWord(&p); @@ -411,7 +411,7 @@ setMouseAction1(MouseActionMap **map, int width, char *p) } static void -setMouseAction2(MouseActionMap *map, char *p) +setMouseAction2(MouseActionMap * map, char *p) { char *s; int f; @@ -1,4 +1,4 @@ -/* $Id: main.c,v 1.153 2002/11/25 16:57:17 ukai Exp $ */ +/* $Id: main.c,v 1.154 2002/11/25 16:59:07 ukai Exp $ */ #define MAINPROGRAM #include "fm.h" #include <signal.h> @@ -4843,8 +4843,8 @@ do_mouse_action(int btn, int x, int y) if (mouse_action.menu_map[btn]) map = &mouse_action.menu_map[btn][x]; } - else - map = &mouse_action.tab_map[btn]; + else + map = &mouse_action.tab_map[btn]; } else if (y == LASTLINE) { if (mouse_action.lastline_str && x >= 0 && @@ -4857,9 +4857,10 @@ do_mouse_action(int btn, int x, int y) if (y == Currentbuf->cursorY + Currentbuf->rootY && (x == Currentbuf->cursorX + Currentbuf->rootX #ifdef JP_CHARSET - || (Currentbuf->currentLine != NULL && - (Currentbuf->currentLine->propBuf[Currentbuf->pos] & PC_KANJI1) - && x == Currentbuf->cursorX + Currentbuf->rootX + 1) + || (Currentbuf->currentLine != NULL && + (Currentbuf->currentLine-> + propBuf[Currentbuf->pos] & PC_KANJI1) + && x == Currentbuf->cursorX + Currentbuf->rootX + 1) #endif /* JP_CHARSET */ )) { if (retrieveCurrentAnchor(Currentbuf) || @@ -4868,8 +4869,7 @@ do_mouse_action(int btn, int x, int y) } else { int cx = Currentbuf->cursorX, cy = Currentbuf->cursorY; - cursorXY(Currentbuf, x - Currentbuf->rootX, - y - Currentbuf->rootY); + cursorXY(Currentbuf, x - Currentbuf->rootX, y - Currentbuf->rootY); if (retrieveCurrentAnchor(Currentbuf) || retrieveCurrentForm(Currentbuf)) map = &mouse_action.anchor_map[btn]; @@ -5124,7 +5124,7 @@ menuMs(void) mouse_action.cursorY < LASTLINE) { cursorXY(Currentbuf, mouse_action.cursorX - Currentbuf->rootX, mouse_action.cursorY - Currentbuf->rootY); - onA(); + onA(); } mainMn(); } |