aboutsummaryrefslogtreecommitdiffstats
path: root/table.c
diff options
context:
space:
mode:
authorFumitoshi UKAI <ukai@debian.or.jp>2002-02-05 12:31:27 +0000
committerFumitoshi UKAI <ukai@debian.or.jp>2002-02-05 12:31:27 +0000
commit735d0c1d5743f4f1610b06b43ec20e4fb0c45441 (patch)
tree568240716cad82cabe64222c47508a3396dee2d5 /table.c
parent[w3m-dev 02990] (diff)
downloadw3m-735d0c1d5743f4f1610b06b43ec20e4fb0c45441.tar.gz
w3m-735d0c1d5743f4f1610b06b43ec20e4fb0c45441.zip
[w3m-dev 02991] form support in w3m -halfdump foo.html|w3m -halfload
* fm.h (DUMP_HALFEXTRA): deleted * proto.h (process_select): return Str * file.c (process_img): process_form() fix * file.c (process_input): process_form() fix * file.c (process_select): return Str process_form() fix * file.c (process_textarea): process_form() fix * file.c (process_form): support -halfdump * file.c (HTMLtagproc1): delete case HTML_FORM_INT, HTML_N_FORM_INT process_{form,select,textarea}() fix * file.c (HTMLlineproc2body): support -halfload HTML_INTERNAL, HTML_N_INTERNAL, HTML_FORM_INT, HTML_FORM_INT, HTML_TEXTAREA_INT, HTML_N_TEXTAREA_INT, HTML_SELECT_INT, HTML_N_SELECT_INT, HTML_OPTION_INT, HTML_TITLE_ALT * file.c (print_internal_information): fix -halfdump * file.c (loadHTMLstream): no DUMP_HALFEXTRA * html.h: add HTML_INTERNAL, HTML_N_INTERNAL, HTML_SELECT_INT, HTML_N_SELECT_INT, HTML_OPTION_INT, HTML_TEXTAREA_INT, HTML_N_TEXTAREA_INT * html.c (ALST_TEXTAREA_INT): added * html.c (ALST_SELECT_INT): added * html.c: add <internal>, </internal>, <select_int>, </select_int> <option_int>, <textarea_int>, </textarea_int> * main.c (MAIN): delete -halfdump_extra dont output <pre> by -halfdump * table.c (feed_table_tag): process_{form,select}() fix add case HTML_INTERNAL, HTML_N_INTERNAL, HTML_SELECT_INT, HTML_N_SELECT_INT, HTML_OPTION_INT, HTML_TEXTAREA_INT, HTML_N_TEXTAREA_INT, * tagtable.tab: add internal, /internal, select_int, /select_int option_int, textarea_int, /textarea_int From: Hironori Sakamoto <hsaka@mth.biglobe.ne.jp>
Diffstat (limited to '')
-rw-r--r--table.c20
1 files changed, 16 insertions, 4 deletions
diff --git a/table.c b/table.c
index 528398c..e8a3fbb 100644
--- a/table.c
+++ b/table.c
@@ -1,4 +1,4 @@
-/* $Id: table.c,v 1.19 2002/01/31 17:54:56 ukai Exp $ */
+/* $Id: table.c,v 1.20 2002/02/05 12:31:27 ukai Exp $ */
/*
* HTML table
*/
@@ -2806,7 +2806,9 @@ feed_table_tag(struct table *tbl, char *line, struct table_mode *mode,
break;
case HTML_FORM:
feed_table_block_tag(tbl, "", mode, 0, cmd);
- process_form(tag);
+ tmp = process_form(tag);
+ if (tmp)
+ feed_table1(tbl, tmp, mode, width);
break;
case HTML_N_FORM:
feed_table_block_tag(tbl, "", mode, 0, cmd);
@@ -2817,7 +2819,9 @@ feed_table_tag(struct table *tbl, char *line, struct table_mode *mode,
feed_table1(tbl, tmp, mode, width);
break;
case HTML_SELECT:
- process_select(tag);
+ tmp = process_select(tag);
+ if (tmp)
+ feed_table1(tbl, tmp, mode, width);
mode->pre_mode |= TBLM_INSELECT;
break;
case HTML_N_SELECT:
@@ -2839,7 +2843,8 @@ feed_table_tag(struct table *tbl, char *line, struct table_mode *mode,
w = tbl->fixed_width[tbl->col];
}
tmp = process_textarea(tag, w);
- feed_table1(tbl, tmp, mode, width);
+ if (tmp)
+ feed_table1(tbl, tmp, mode, width);
mode->pre_mode |= TBLM_INTXTA;
break;
case HTML_N_TEXTAREA:
@@ -2937,10 +2942,17 @@ feed_table_tag(struct table *tbl, char *line, struct table_mode *mode,
case HTML_NOP:
suspend_or_pushdata(tbl, line);
break;
+ case HTML_INTERNAL:
+ case HTML_N_INTERNAL:
case HTML_FORM_INT:
case HTML_N_FORM_INT:
case HTML_INPUT_ALT:
case HTML_N_INPUT_ALT:
+ case HTML_SELECT_INT:
+ case HTML_N_SELECT_INT:
+ case HTML_OPTION_INT:
+ case HTML_TEXTAREA_INT:
+ case HTML_N_TEXTAREA_INT:
case HTML_IMG_ALT:
case HTML_EOL:
case HTML_RULE: