| blob | a645e25637761174f7f4fd7b3001631bd757ed08 |
1 Description: Support the button element as defined in HTML 4.01
2 Origin: upstream, http://www.sic.med.tohoku.ac.jp/~satodai/w3m-dev/201009.month/4411.html
3 Bug-Debian: http://bugs.debian.org/136810
5 Index: file.c
6 ===================================================================
7 RCS file: /cvsroot/w3m/w3m/file.c,v
8 retrieving revision 1.264
9 diff -u -r1.264 file.c
10 --- w3m.orig/file.c 3 Aug 2010 10:02:16 -0000 1.264
11 +++ w3m/file.c 17 Sep 2010 12:18:55 -0000
12 @@ -2467,6 +2467,7 @@
13 bcopy((void *)&obuf->anchor, (void *)&obuf->bp.anchor,
14 sizeof(obuf->anchor));
15 obuf->bp.img_alt = obuf->img_alt;
16 + obuf->bp.input_alt = obuf->input_alt;
17 obuf->bp.in_bold = obuf->in_bold;
18 obuf->bp.in_italic = obuf->in_italic;
19 obuf->bp.in_under = obuf->in_under;
20 @@ -2484,6 +2485,7 @@
21 bcopy((void *)&obuf->bp.anchor, (void *)&obuf->anchor,
22 sizeof(obuf->anchor));
23 obuf->img_alt = obuf->bp.img_alt;
24 + obuf->input_alt = obuf->bp.input_alt;
25 obuf->in_bold = obuf->bp.in_bold;
26 obuf->in_italic = obuf->bp.in_italic;
27 obuf->in_under = obuf->bp.in_under;
28 @@ -2727,7 +2729,7 @@
29 Str line = obuf->line, pass = NULL;
30 char *hidden_anchor = NULL, *hidden_img = NULL, *hidden_bold = NULL,
31 *hidden_under = NULL, *hidden_italic = NULL, *hidden_strike = NULL,
32 - *hidden_ins = NULL, *hidden = NULL;
33 + *hidden_ins = NULL, *hidden_input, *hidden = NULL;
35 #ifdef DEBUG
36 if (w3m_debug) {
37 @@ -2759,6 +2761,12 @@
38 hidden = hidden_img;
39 }
40 }
41 + if (obuf->input_alt.in) {
42 + if ((hidden_input = has_hidden_link(obuf, HTML_INPUT_ALT)) != NULL) {
43 + if (!hidden || hidden_input < hidden)
44 + hidden = hidden_input;
45 + }
46 + }
47 if (obuf->in_bold) {
48 if ((hidden_bold = has_hidden_link(obuf, HTML_B)) != NULL) {
49 if (!hidden || hidden_bold < hidden)
50 @@ -2810,6 +2818,8 @@
51 Strcat_charp(line, "</a>");
52 if (obuf->img_alt && !hidden_img)
53 Strcat_charp(line, "</img_alt>");
54 + if (obuf->input_alt.in && !hidden_input)
55 + Strcat_charp(line, "</input_alt>");
56 if (obuf->in_bold && !hidden_bold)
57 Strcat_charp(line, "</b>");
58 if (obuf->in_italic && !hidden_italic)
59 @@ -3020,6 +3030,18 @@
60 Strcat_charp(tmp, "\">");
61 push_tag(obuf, tmp->ptr, HTML_IMG_ALT);
62 }
63 + if (!hidden_input && obuf->input_alt.in) {
64 + Str tmp;
65 + if (obuf->input_alt.hseq > 0)
66 + obuf->input_alt.hseq = - obuf->input_alt.hseq;
67 + tmp = Sprintf("<INPUT_ALT hseq=\"%d\" fid=\"%d\" name=\"%s\" type=\"%s\" value=\"%s\">",
68 + obuf->input_alt.hseq,
69 + obuf->input_alt.fid,
70 + obuf->input_alt.name->ptr,
71 + obuf->input_alt.type->ptr,
72 + obuf->input_alt.value->ptr);
73 + push_tag(obuf, tmp->ptr, HTML_INPUT_ALT);
74 + }
75 if (!hidden_bold && obuf->in_bold)
76 push_tag(obuf, "<B>", HTML_B);
77 if (!hidden_italic && obuf->in_italic)
78 @@ -3730,6 +3752,63 @@
79 }
81 Str
82 +process_button(struct parsed_tag *tag)
83 +{
84 + Str tmp = NULL;
85 + char *p, *q, *r, *qq = NULL;
86 + int qlen, v;
87 +
88 + if (cur_form_id < 0) {
89 + char *s = "<form_int method=internal action=none>";
90 + tmp = process_form(parse_tag(&s, TRUE));
91 + }
92 + if (tmp == NULL)
93 + tmp = Strnew();
94 +
95 + p = "submit";
96 + parsedtag_get_value(tag, ATTR_TYPE, &p);
97 + q = NULL;
98 + parsedtag_get_value(tag, ATTR_VALUE, &q);
99 + r = "";
100 + parsedtag_get_value(tag, ATTR_NAME, &r);
101 +
102 + v = formtype(p);
103 + if (v == FORM_UNKNOWN)
104 + return NULL;
105 +
106 + if (!q) {
107 + switch (v) {
108 + case FORM_INPUT_SUBMIT:
109 + case FORM_INPUT_BUTTON:
110 + q = "SUBMIT";
111 + break;
112 + case FORM_INPUT_RESET:
113 + q = "RESET";
114 + break;
115 + }
116 + }
117 + if (q) {
118 + qq = html_quote(q);
119 + qlen = strlen(q);
120 + }
121 +
122 + // Strcat_charp(tmp, "<pre_int>");
123 + Strcat(tmp, Sprintf("<input_alt hseq=\"%d\" fid=\"%d\" type=%s "
124 + "name=\"%s\" value=\"%s\">",
125 + cur_hseq++, cur_form_id, p, html_quote(r), qq));
126 + return tmp;
127 +}
128 +
129 +Str
130 +process_n_button(void)
131 +{
132 + Str tmp = Strnew();
133 + Strcat_charp(tmp, "</input_alt>");
134 + // Strcat_charp(tmp, "</pre_int>");
135 + return tmp;
136 +}
137 +
138 +Str
139 process_select(struct parsed_tag *tag)
140 {
141 Str tmp = NULL;
142 @@ -4859,7 +4938,35 @@
143 if (i > obuf->bottom_margin)
144 obuf->bottom_margin = i;
145 }
146 + if (parsedtag_get_value(tag, ATTR_HSEQ, &hseq)) {
147 + obuf->input_alt.hseq = hseq;
148 + }
149 + if (parsedtag_get_value(tag, ATTR_FID, &i)) {
150 + obuf->input_alt.fid = i;
151 + }
152 + if (parsedtag_get_value(tag, ATTR_TYPE, &p)) {
153 + obuf->input_alt.type = Strnew_charp(p);
154 + }
155 + if (parsedtag_get_value(tag, ATTR_VALUE, &p)) {
156 + obuf->input_alt.value = Strnew_charp(p);
157 + }
158 + if (parsedtag_get_value(tag, ATTR_NAME, &p)) {
159 + obuf->input_alt.name = Strnew_charp(p);
160 + }
161 + obuf->input_alt.in = 1;
162 return 0;
163 + case HTML_N_INPUT_ALT:
164 + if (obuf->input_alt.in) {
165 + if (!close_effect0(obuf, HTML_INPUT_ALT))
166 + push_tag(obuf, "</input_alt>", HTML_N_INPUT_ALT);
167 + obuf->input_alt.hseq = 0;
168 + obuf->input_alt.fid = -1;
169 + obuf->input_alt.in = 0;
170 + obuf->input_alt.type = NULL;
171 + obuf->input_alt.name = NULL;
172 + obuf->input_alt.value = NULL;
173 + }
174 + return 1;
175 case HTML_TABLE:
176 close_anchor(h_env, obuf);
177 obuf->table_level++;
178 @@ -4968,6 +5075,16 @@
179 case HTML_INPUT:
180 close_anchor(h_env, obuf);
181 tmp = process_input(tag);
182 + if (tmp)
183 + HTMLlineproc1(tmp->ptr, h_env);
184 + return 1;
185 + case HTML_BUTTON:
186 + tmp = process_button(tag);
187 + if (tmp)
188 + HTMLlineproc1(tmp->ptr, h_env);
189 + return 1;
190 + case HTML_N_BUTTON:
191 + tmp = process_n_button();
192 if (tmp)
193 HTMLlineproc1(tmp->ptr, h_env);
194 return 1;
195 @@ -5680,6 +5797,21 @@
196 putHmarker(buf->hmarklist, currentLn(buf),
197 hpos, hseq - 1);
198 }
199 + else if (hseq < 0) {
200 + int h = -hseq - 1;
201 + int hpos = pos;
202 + if (*str == '[')
203 + hpos++;
204 + if (buf->hmarklist &&
205 + h < buf->hmarklist->nmark &&
206 + buf->hmarklist->marks[h].invalid) {
207 + buf->hmarklist->marks[h].pos = hpos;
208 + buf->hmarklist->marks[h].line = currentLn(buf);
209 + buf->hmarklist->marks[h].invalid = 0;
210 + hseq = -hseq;
211 + }
212 + }
213 +
214 if (!form->target)
215 form->target = buf->baseTarget;
216 if (a_textarea &&
217 @@ -6747,6 +6879,12 @@
218 obuf->nobr_level = 0;
219 bzero((void *)&obuf->anchor, sizeof(obuf->anchor));
220 obuf->img_alt = 0;
221 + obuf->input_alt.hseq = 0;
222 + obuf->input_alt.fid = -1;
223 + obuf->input_alt.in = 0;
224 + obuf->input_alt.type = NULL;
225 + obuf->input_alt.name = NULL;
226 + obuf->input_alt.value = NULL;
227 obuf->in_bold = 0;
228 obuf->in_italic = 0;
229 obuf->in_under = 0;
230 @@ -6782,6 +6920,15 @@
231 push_tag(obuf, "</img_alt>", HTML_N_IMG_ALT);
232 obuf->img_alt = NULL;
233 }
234 + if (obuf->input_alt.in) {
235 + push_tag(obuf, "</input_alt>", HTML_N_INPUT_ALT);
236 + obuf->input_alt.hseq = 0;
237 + obuf->input_alt.fid = -1;
238 + obuf->input_alt.in = 0;
239 + obuf->input_alt.type = NULL;
240 + obuf->input_alt.name = NULL;
241 + obuf->input_alt.value = NULL;
242 + }
243 if (obuf->in_bold) {
244 push_tag(obuf, "</b>", HTML_N_B);
245 obuf->in_bold = 0;
246 Index: fm.h
247 ===================================================================
248 RCS file: /cvsroot/w3m/w3m/fm.h,v
249 retrieving revision 1.149
250 diff -u -r1.149 fm.h
251 --- w3m.orig/fm.h 20 Aug 2010 09:47:09 -0000 1.149
252 +++ w3m/fm.h 17 Sep 2010 12:18:55 -0000
253 @@ -562,6 +562,13 @@
254 #define INIT_BUFFER_WIDTH ((_INIT_BUFFER_WIDTH > 0) ? _INIT_BUFFER_WIDTH : 0)
255 #define FOLD_BUFFER_WIDTH (FoldLine ? (INIT_BUFFER_WIDTH + 1) : -1)
257 +struct input_alt_attr {
258 + int hseq;
259 + int fid;
260 + int in;
261 + Str type, name, value;
262 +};
263 +
264 typedef struct {
265 int pos;
266 int len;
267 @@ -569,6 +576,7 @@
268 long flag;
269 Anchor anchor;
270 Str img_alt;
271 + struct input_alt_attr input_alt;
272 char fontstat[FONTSTAT_SIZE];
273 short nobr_level;
274 Lineprop prev_ctype;
275 @@ -591,6 +599,7 @@
276 short nobr_level;
277 Anchor anchor;
278 Str img_alt;
279 + struct input_alt_attr input_alt;
280 char fontstat[FONTSTAT_SIZE];
281 char fontstat_stack[FONT_STACK_SIZE][FONTSTAT_SIZE];
282 int fontstat_sp;
283 Index: html.c
284 ===================================================================
285 RCS file: /cvsroot/w3m/w3m/html.c,v
286 retrieving revision 1.32
287 diff -u -r1.32 html.c
288 --- w3m.orig/html.c 14 Aug 2010 01:29:40 -0000 1.32
289 +++ w3m/html.c 17 Sep 2010 12:18:55 -0000
290 @@ -56,6 +56,9 @@
291 ATTR_CORE
292 };
293 #define MAXA_INPUT MAXA_CORE + 12
294 +unsigned char ALST_BUTTON[] =
295 + { ATTR_TYPE, ATTR_VALUE, ATTR_NAME, ATTR_CORE };
296 +#define MAXA_BUTTON MAXA_CORE + 3
297 unsigned char ALST_TEXTAREA[] =
298 { ATTR_COLS, ATTR_ROWS, ATTR_NAME, ATTR_READONLY, ATTR_CORE };
299 #define MAXA_TEXTAREA MAXA_CORE + 4
300 @@ -247,24 +250,24 @@
301 {"/bdo", NULL, 0, TFLG_END}, /* 121 HTML_N_BDO */
302 {"big", ALST_NOP, MAXA_NOP, 0}, /* 122 HTML_BIG */
303 {"/big", NULL, 0, TFLG_END}, /* 123 HTML_N_BIG */
304 - {"button", ALST_NOP, MAXA_NOP, 0}, /* 124 HTML_BUTTON */
305 - {"fieldset", ALST_NOP, MAXA_NOP, 0}, /* 125 HTML_FIELDSET */
306 - {"/fieldset", NULL, 0, TFLG_END}, /* 126 HTML_N_FIELDSET */
307 - {"iframe", ALST_NOP, MAXA_NOP, 0}, /* 127 HTML_IFRAME */
308 - {"label", ALST_NOP, MAXA_NOP, 0}, /* 128 HTML_LABEL */
309 - {"/label", NULL, 0, TFLG_END}, /* 129 HTML_N_LABEL */
310 - {"legend", ALST_NOP, MAXA_NOP, 0}, /* 130 HTML_LEGEND */
311 - {"/legend", NULL, 0, TFLG_END}, /* 131 HTML_N_LEGEND */
312 - {"noscript", ALST_NOP, MAXA_NOP, 0}, /* 132 HTML_NOSCRIPT */
313 - {"/noscript", NULL, 0, TFLG_END}, /* 133 HTML_N_NOSCRIPT */
314 - {"object", ALST_NOP, MAXA_NOP, 0}, /* 134 HTML_OBJECT */
315 - {"optgroup", ALST_NOP, MAXA_NOP, 0}, /* 135 HTML_OPTGROUP */
316 - {"/optgroup", NULL, 0, TFLG_END}, /* 136 HTML_N_OPTGROUP */
317 - {"param", ALST_NOP, MAXA_NOP, 0}, /* 137 HTML_PARAM */
318 - {"small", ALST_NOP, MAXA_NOP, 0}, /* 138 HTML_SMALL */
319 - {"/small", NULL, 0, TFLG_END}, /* 139 HTML_N_SMALL */
320 + {"button", ALST_BUTTON, MAXA_BUTTON, 0}, /* 124 HTML_BUTTON */
321 + {"/button", NULL, 0, TFLG_END}, /* 125 HTML_N_BUTTON */
322 + {"fieldset", ALST_NOP, MAXA_NOP, 0}, /* 126 HTML_FIELDSET */
323 + {"/fieldset", NULL, 0, TFLG_END}, /* 127 HTML_N_FIELDSET */
324 + {"iframe", ALST_NOP, MAXA_NOP, 0}, /* 128 HTML_IFRAME */
325 + {"label", ALST_NOP, MAXA_NOP, 0}, /* 129 HTML_LABEL */
326 + {"/label", NULL, 0, TFLG_END}, /* 130 HTML_N_LABEL */
327 + {"legend", ALST_NOP, MAXA_NOP, 0}, /* 131 HTML_LEGEND */
328 + {"/legend", NULL, 0, TFLG_END}, /* 132 HTML_N_LEGEND */
329 + {"noscript", ALST_NOP, MAXA_NOP, 0}, /* 133 HTML_NOSCRIPT */
330 + {"/noscript", NULL, 0, TFLG_END}, /* 134 HTML_N_NOSCRIPT */
331 + {"object", ALST_NOP, MAXA_NOP, 0}, /* 135 HTML_OBJECT */
332 + {"optgroup", ALST_NOP, MAXA_NOP, 0}, /* 136 HTML_OPTGROUP */
333 + {"/optgroup", NULL, 0, TFLG_END}, /* 137 HTML_N_OPTGROUP */
334 + {"param", ALST_NOP, MAXA_NOP, 0}, /* 138 HTML_PARAM */
335 + {"small", ALST_NOP, MAXA_NOP, 0}, /* 139 HTML_SMALL */
336 + {"/small", NULL, 0, TFLG_END}, /* 140 HTML_N_SMALL */
338 - {NULL, NULL, 0, 0}, /* 140 Undefined */
339 {NULL, NULL, 0, 0}, /* 141 Undefined */
340 {NULL, NULL, 0, 0}, /* 142 Undefined */
341 {NULL, NULL, 0, 0}, /* 143 Undefined */
342 Index: html.h
343 ===================================================================
344 RCS file: /cvsroot/w3m/w3m/html.h,v
345 retrieving revision 1.31
346 diff -u -r1.31 html.h
347 --- w3m.orig/html.h 14 Aug 2010 01:29:40 -0000 1.31
348 +++ w3m/html.h 17 Sep 2010 12:18:55 -0000
349 @@ -214,21 +214,22 @@
350 #define HTML_BIG 122
351 #define HTML_N_BIG 123
352 #define HTML_BUTTON 124
353 -#define HTML_FIELDSET 125
354 -#define HTML_N_FIELDSET 126
355 -#define HTML_IFRAME 127
356 -#define HTML_LABEL 128
357 -#define HTML_N_LABEL 129
358 -#define HTML_LEGEND 130
359 -#define HTML_N_LEGEND 131
360 -#define HTML_NOSCRIPT 132
361 -#define HTML_N_NOSCRIPT 133
362 -#define HTML_OBJECT 134
363 -#define HTML_OPTGROUP 135
364 -#define HTML_N_OPTGROUP 136
365 -#define HTML_PARAM 137
366 -#define HTML_SMALL 138
367 -#define HTML_N_SMALL 139
368 +#define HTML_N_BUTTON 125
369 +#define HTML_FIELDSET 126
370 +#define HTML_N_FIELDSET 127
371 +#define HTML_IFRAME 128
372 +#define HTML_LABEL 129
373 +#define HTML_N_LABEL 130
374 +#define HTML_LEGEND 131
375 +#define HTML_N_LEGEND 132
376 +#define HTML_NOSCRIPT 133
377 +#define HTML_N_NOSCRIPT 134
378 +#define HTML_OBJECT 135
379 +#define HTML_OPTGROUP 136
380 +#define HTML_N_OPTGROUP 137
381 +#define HTML_PARAM 138
382 +#define HTML_SMALL 139
383 +#define HTML_N_SMALL 140
385 /* pseudo tag */
386 #define HTML_SELECT_INT 160
387 Index: proto.h
388 ===================================================================
389 RCS file: /cvsroot/w3m/w3m/proto.h,v
390 retrieving revision 1.104
391 diff -u -r1.104 proto.h
392 --- w3m.orig/proto.h 25 Jul 2010 09:55:05 -0000 1.104
393 +++ w3m/proto.h 17 Sep 2010 12:18:55 -0000
394 @@ -207,6 +207,8 @@
395 extern Str process_img(struct parsed_tag *tag, int width);
396 extern Str process_anchor(struct parsed_tag *tag, char *tagbuf);
397 extern Str process_input(struct parsed_tag *tag);
398 +extern Str process_button(struct parsed_tag *tag);
399 +extern Str process_n_button(void);
400 extern Str process_select(struct parsed_tag *tag);
401 extern Str process_n_select(void);
402 extern void feed_select(char *str);
403 Index: table.c
404 ===================================================================
405 RCS file: /cvsroot/w3m/w3m/table.c,v
406 retrieving revision 1.58
407 diff -u -r1.58 table.c
408 --- w3m.orig/table.c 9 Aug 2010 11:59:19 -0000 1.58
409 +++ w3m/table.c 17 Sep 2010 12:18:55 -0000
410 @@ -2878,6 +2878,14 @@
411 tmp = process_input(tag);
412 feed_table1(tbl, tmp, mode, width);
413 break;
414 + case HTML_BUTTON:
415 + tmp = process_button(tag);
416 + feed_table1(tbl, tmp, mode, width);
417 + break;
418 + case HTML_N_BUTTON:
419 + tmp = process_n_button();
420 + feed_table1(tbl, tmp, mode, width);
421 + break;
422 case HTML_SELECT:
423 tmp = process_select(tag);
424 if (tmp)
425 Index: tagtable.tab
426 ===================================================================
427 RCS file: /cvsroot/w3m/w3m/tagtable.tab,v
428 retrieving revision 1.14
429 diff -u -r1.14 tagtable.tab
430 --- w3m.orig/tagtable.tab 14 Aug 2010 01:29:40 -0000 1.14
431 +++ w3m/tagtable.tab 17 Sep 2010 12:18:55 -0000
432 @@ -176,6 +176,7 @@
433 big HTML_BIG
434 /big HTML_N_BIG
435 button HTML_BUTTON
436 +/button HTML_N_BUTTON
437 fieldset HTML_FIELDSET
438 /fieldset HTML_N_FIELDSET
439 iframe HTML_IFRAME