[w3m-dev 03895] type=image support of pre_form

* form.c (loadPreFOrm): add image
	(preFormUpdateBuffer): add FORM_INPUT_IMAGE
* doc/README.pre_form: update
* doc-jp/README.pre_form: ditto
From: Hironori SAKAMOTO <h-saka@lsi.nec.co.jp>
This commit is contained in:
Fumitoshi UKAI
2003-05-12 16:24:50 +00:00
parent 2294b42faa
commit ca183f36c4
4 changed files with 26 additions and 11 deletions

View File

@@ -1,3 +1,11 @@
2003-05-13 Hironori SAKAMOTO <h-saka@lsi.nec.co.jp>
* [w3m-dev 03895] type=image support of pre_form
* form.c (loadPreFOrm): add image
(preFormUpdateBuffer): add FORM_INPUT_IMAGE
* doc/README.pre_form: update
* doc-jp/README.pre_form: ditto
2003-05-11 Fumitoshi UKAI <ukai@debian.or.jp> 2003-05-11 Fumitoshi UKAI <ukai@debian.or.jp>
* [w3m-dev 03891] Re: urimethodmap and relative URL * [w3m-dev 03891] Re: urimethodmap and relative URL
@@ -7796,4 +7804,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.833 2003/05/10 18:20:29 ukai Exp $ $Id: ChangeLog,v 1.834 2003/05/12 16:24:50 ukai Exp $

View File

@@ -14,7 +14,8 @@ password <name> <value>
checkbox <name> <value> [<checked>] checkbox <name> <value> [<checked>]
radio <name> <value> radio <name> <value>
section <name> <value> section <name> <value>
submit [<name>] submit [<name> [<value>]]
image [<name> [<value>]]
textarea <name> textarea <name>
<value> <value>
: :
@@ -28,7 +29,7 @@ input, select $B$^$?$O(B textarea $BMWAG$N(B value $BB0@-$r@_Dj$7$^$9!#(B
checkbox, radio $B$O(B name $BB0@-$H(B value $BB0@-$,0lCW$9$k(B input $BMWAG$r(B checkbox, radio $B$O(B name $BB0@-$H(B value $BB0@-$,0lCW$9$k(B input $BMWAG$r(B
check $B$7$^$9!#(B check $B$7$^$9!#(B
<checked> $B$,(B 0$B!"(Bno $B$^$?$O(B off $B$N>l9g$O(B checkbox $B$N(B check $B$r30$7$^$9!#(B <checked> $B$,(B 0$B!"(Bno $B$^$?$O(B off $B$N>l9g$O(B checkbox $B$N(B check $B$r30$7$^$9!#(B
submit $B$N>l9g!"(B<name> $B$,@_Dj$7$F$"$k;~$O!"0lCW$9$k(B name $BB0@-$r;}$D(B submit, image $B$N>l9g!"(B<name> $B$,@_Dj$7$F$"$k;~$O!"0lCW$9$k(B name $BB0@-(B
input $BMWAG$r(B submit $B$7$^$9!#(B<name> $B$,@_Dj$7$F$$$J$$>l9g$O!":G8e$N(B ($B$H(B value $BB0@-(B)$B$r;}$D(B input $BMWAG$r(B submit $B$7$^$9!#(B<name> $B$r@_Dj$7$F(B
input type=submit $BMWAG$r(B submit $B$7$^$9!#(B $B$$$J$$>l9g$O!":G8e$N(B input type=submit $BMWAG$r(B submit $B$7$^$9!#(B
<name> $B$d(B <value> $B$O!"%7%'%k$NMM$K(B \,'$B!A(B',"$B!A(B" $B$G%/%)!<%H2DG=$G$9!#(B <name> $B$d(B <value> $B$O!"%7%'%k$NMM$K(B \,'$B!A(B',"$B!A(B" $B$G%/%)!<%H2DG=$G$9!#(B

View File

@@ -16,7 +16,8 @@ password <name> <value>
checkbox <name> <value> [<checked>] checkbox <name> <value> [<checked>]
radio <name> <value> radio <name> <value>
section <name> <value> section <name> <value>
submit [<name>] submit [<name> [<value>]]
image [<name> [<value>]]
textarea <name> textarea <name>
<value> <value>
: :
@@ -33,9 +34,10 @@ The line beginning with checkbox, radio means that it will check
input element which name and value attribute matches with <name> and <value> input element which name and value attribute matches with <name> and <value>
respectively. If <checked> is 0, no, or off, disable check of the checkbox. respectively. If <checked> is 0, no, or off, disable check of the checkbox.
The line beginning with submit means that it will submit input element which The line beginning with submit or image means that it will submit input
name attribute matches with <name>, or submit last <input type=submit> element which name attribute matches with <name> (and value attribute
element if no <name> specified. matches with <value>), or submit last <input type=submit> element if no
<name> specified.
You quote \, ' (single-quote) or " (double quote) as you do in shell. You quote \, ' (single-quote) or " (double quote) as you do in shell.

8
form.c
View File

@@ -1,4 +1,4 @@
/* $Id: form.c,v 1.30 2003/01/29 17:10:38 ukai Exp $ */ /* $Id: form.c,v 1.31 2003/05/12 16:24:53 ukai Exp $ */
/* /*
* HTML forms * HTML forms
*/ */
@@ -727,6 +727,7 @@ add_pre_form_item(struct pre_form *pf, struct pre_form_item *prev, int type,
* radio <name> <value> * radio <name> <value>
* select <name> <value> * select <name> <value>
* submit [<name> [<value>]] * submit [<name> [<value>]]
* image [<name> [<value>]]
* textarea <name> * textarea <name>
* <value> * <value>
* /textarea * /textarea
@@ -810,6 +811,8 @@ loadPreForm(void)
type = FORM_INPUT_RADIO; type = FORM_INPUT_RADIO;
else if (!strcmp(s, "submit")) else if (!strcmp(s, "submit"))
type = FORM_INPUT_SUBMIT; type = FORM_INPUT_SUBMIT;
else if (!strcmp(s, "image"))
type = FORM_INPUT_IMAGE;
else if (!strcmp(s, "select")) else if (!strcmp(s, "select"))
type = FORM_SELECT; type = FORM_SELECT;
else if (!strcmp(s, "textarea")) { else if (!strcmp(s, "textarea")) {
@@ -873,7 +876,8 @@ preFormUpdateBuffer(Buffer *buf)
for (pi = pf->item; pi; pi = pi->next) { for (pi = pf->item; pi; pi = pi->next) {
if (pi->type != fi->type) if (pi->type != fi->type)
continue; continue;
if (pi->type == FORM_INPUT_SUBMIT) { if (pi->type == FORM_INPUT_SUBMIT ||
pi->type == FORM_INPUT_IMAGE) {
if ((!pi->name || !*pi->name || if ((!pi->name || !*pi->name ||
(fi->name && !Strcmp_charp(fi->name, pi->name))) && (fi->name && !Strcmp_charp(fi->name, pi->name))) &&
(!pi->value || !*pi->value || (!pi->value || !*pi->value ||