aniani/elinks
1
0
Fork 0
mirror of https://github.com/rkd77/elinks.git synced 2024-12-04 14:46:47 -05:00
Code

The fix for bug 784. There is a wide area to cleanup and tidy up the code.

Browse Source
This commit is contained in:
Witold Filipczyk 2006-08-05 18:32:05 +02:00 committed by Witold Filipczyk
parent bdc3fcb7e4
commit b7409fc5a7
2 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/document/html/parser/forms.c
View File

@ -146,10 +146,11 @@ html_button(struct html_context *html_context, unsigned char *a,
unsigned char *al; unsigned char *al;
struct form_control *fc; struct form_control *fc;
enum form_type type = FC_SUBMIT; enum form_type type = FC_SUBMIT;
int cp = html_context->part->document->cp;
html_focusable(html_context, a); html_focusable(html_context, a);
al = get_attr_val(a, "type", html_context->options->cp); al = get_attr_val(a, "type", cp);
if (!al) goto no_type_attr; if (!al) goto no_type_attr;
if (!strcasecmp(al, "button")) { if (!strcasecmp(al, "button")) {
@ -167,9 +168,9 @@ no_type_attr:
fc = init_form_control(type, a, html_context); fc = init_form_control(type, a, html_context);
if (!fc) return; if (!fc) return;
fc->id = get_attr_val(a, "id", html_context->options->cp); fc->id = get_attr_val(a, "id", cp);
fc->name = get_attr_val(a, "name", html_context->options->cp); fc->name = get_attr_val(a, "name", cp);
fc->default_value = get_attr_val(a, "value", html_context->options->cp); fc->default_value = get_attr_val(a, "value", cp);
if (!fc->default_value) { if (!fc->default_value) {
if (fc->type == FC_SUBMIT) if (fc->type == FC_SUBMIT)
fc->default_value = stracpy("Submit"); fc->default_value = stracpy("Submit");
@ -265,11 +266,12 @@ html_input(struct html_context *html_context, unsigned char *a,
{ {
unsigned char *al; unsigned char *al;
struct form_control *fc; struct form_control *fc;
int cp = html_context->part->document->cp;
fc = init_form_control(FC_TEXT, a, html_context); fc = init_form_control(FC_TEXT, a, html_context);
if (!fc) return; if (!fc) return;
al = get_attr_val(a, "type", html_context->options->cp); al = get_attr_val(a, "type", cp);
if (al) { if (al) {
if (!strcasecmp(al, "text")) fc->type = FC_TEXT; if (!strcasecmp(al, "text")) fc->type = FC_TEXT;
else if (!strcasecmp(al, "hidden")) fc->type = FC_HIDDEN; else if (!strcasecmp(al, "hidden")) fc->type = FC_HIDDEN;
@ -286,8 +288,7 @@ html_input(struct html_context *html_context, unsigned char *a,
} }
if (fc->type != FC_FILE) if (fc->type != FC_FILE)
fc->default_value = get_attr_val(a, "value", fc->default_value = get_attr_val(a, "value", cp);
html_context->options->cp);
if (!fc->default_value) { if (!fc->default_value) {
if (fc->type == FC_CHECKBOX) if (fc->type == FC_CHECKBOX)
fc->default_value = stracpy("on"); fc->default_value = stracpy("on");
@ -301,22 +302,21 @@ html_input(struct html_context *html_context, unsigned char *a,
if (!fc->default_value) if (!fc->default_value)
fc->default_value = stracpy(""); fc->default_value = stracpy("");
fc->id = get_attr_val(a, "id", html_context->options->cp); fc->id = get_attr_val(a, "id", cp);
fc->name = get_attr_val(a, "name", html_context->options->cp); fc->name = get_attr_val(a, "name", cp);
fc->size = get_num(a, "size", html_context->options->cp); fc->size = get_num(a, "size", cp);
if (fc->size == -1) if (fc->size == -1)
fc->size = html_context->options->default_form_input_size; fc->size = html_context->options->default_form_input_size;
fc->size++; fc->size++;
if (fc->size > html_context->options->box.width) if (fc->size > html_context->options->box.width)
fc->size = html_context->options->box.width; fc->size = html_context->options->box.width;
fc->maxlength = get_num(a, "maxlength", html_context->options->cp); fc->maxlength = get_num(a, "maxlength", cp);
if (fc->maxlength == -1) fc->maxlength = INT_MAX; if (fc->maxlength == -1) fc->maxlength = INT_MAX;
if (fc->type == FC_CHECKBOX || fc->type == FC_RADIO) if (fc->type == FC_CHECKBOX || fc->type == FC_RADIO)
fc->default_state = has_attr(a, "checked", fc->default_state = has_attr(a, "checked", cp);
html_context->options->cp);
if (fc->type == FC_IMAGE) if (fc->type == FC_IMAGE)
fc->alt = get_attr_val(a, "alt", html_context->options->cp); fc->alt = get_attr_val(a, "alt", cp);
if (fc->type != FC_HIDDEN) { if (fc->type != FC_HIDDEN) {
html_input_format(html_context, a, fc); html_input_format(html_context, a, fc);

3
src/document/html/parser/link.c
View File

@ -215,6 +215,7 @@ html_img_do(unsigned char *a, unsigned char *object_src,
unsigned char *usemap_attr; unsigned char *usemap_attr;
struct document_options *options = html_context->options; struct document_options *options = html_context->options;
int display_style = options->image_link.display_style; int display_style = options->image_link.display_style;
int cp = html_context->part->document->cp;
/* Note about display_style: /* Note about display_style:
* 0 means always display IMG * 0 means always display IMG
@ -246,7 +247,7 @@ html_img_do(unsigned char *a, unsigned char *object_src,
&& !usemap; && !usemap;
if (display_style == 2 || display_style == 3) { if (display_style == 2 || display_style == 3) {
label = get_attr_val(a, "alt", options->cp); label = get_attr_val(a, "alt", cp);
if (!label) if (!label)
label = get_attr_val(a, "title", options->cp); label = get_attr_val(a, "title", options->cp);