$B$d$^$F$G$9!#(B
$B$b$&0lEY!#(Bframe$BFb$N(Btag$B=q$-49$($rC1=c$K$7$?(Bpatch$B$rAw$j$^$9!#(B
HREF/ACTION/SRC$BB0@-$K$O!"<+F0E*$K(BTARGET/REFERER$BB0@-$rDI2C(B/$BJQ99$9$k$h$&(B
$B$K$J$C$F$$$^$9!#(B
html.c$B$NJQ99$OL5$7$H$7$^$7$?!#(Bhtml.c$B$H(Bparsetagx.o$B$N0MB84X78$O5-=R$7(B
$B$F$"$j$^$9!#(B
diff$B$r8+$FJ,$+$kDL$j!"(Bw3m-0.1.11-pre + kokb23 + [w3m-dev 1559 + $BI,MW(B
$B$J(Bpatch] $B$+$i$N:9J,$G$9!#(B
$B!D!D$D$$$G$J$,$i!#2,It$5$s$N$H$3$m$K$"$k(B kokb23 $B$rEv$F$k$H!"(B
HISTORY.kokb$B$G(B
\ No newline at end of file
$B$H$$$&9T$N$H$3$m$G(Bpatch$B$,;_$^$C$F$7$^$$$^$9!#<+J,$K$D$$$F$O(Bpatch$B$N%P!<(B
$B%8%g%s$r>e$2$l$P$$$$$N$G$9$,!"(Bw3m-dev$B$NHO0O30$r9M$($F!"$3$N9T$rH4$$$F(B
$B$*$$$F$b$i$$$?$$$J$H!#(BFreeBSD$B$N(Bport$B$,GA$$$F$$$k$3$H$b$"$k$+$b$7$l$J$$(B
$B$N$G!#(B
--- map+area$B$r(Bframe$BBP1~$K$7$?$$$H$+!"(Bform$BEy!9$r(Bframe$BBP1~$K$7$?$$$H$+!D!D(B $B$d$^$F(B
diff -rC2 -x XX* -x *table -x *[^.l]? -x *.[^che] -x config* w3m-0.1.11-pre-kokb23+1559/XMakefile w3m-0.1.11-pre-kokb23+157x/XMakefile *** w3m-0.1.11-pre-kokb23+1559/XMakefile Tue Dec 26 19:23:49 2000 --- w3m-0.1.11-pre-kokb23+157x/XMakefile Tue Dec 26 20:09:58 2000 *************** *** 45,48 **** --- 45,49 ---- keybind.o: funcname2.h keybind_lynx.o: funcname2.h + parsetagx.o: html.c funcname.c: funcname.tab diff -rC2 -x XX* -x *table -x *[^.l]? -x *.[^che] -x config* w3m-0.1.11-pre-kokb23+1559/frame.c w3m-0.1.11-pre-kokb23+157x/frame.c *** w3m-0.1.11-pre-kokb23+1559/frame.c Tue Dec 26 19:23:43 2000 --- w3m-0.1.11-pre-kokb23+157x/frame.c Tue Dec 26 19:36:01 2000 *************** *** 565,569 **** if (tok->ptr[0] == '<') { char *q = tok->ptr; ! int j, is_anchor = 0, a_target = 0; struct parsed_tag *tag; ParsedURL url; --- 565,569 ---- if (tok->ptr[0] == '<') { char *q = tok->ptr; ! int j, a_target = 0; struct parsed_tag *tag; ParsedURL url; *************** *** 638,680 **** } break; - case HTML_A: - is_anchor = 1; - a_target = 2; - if (parsedtag_get_value(tag, ATTR_TARGET, &q)) { - a_target = 0; - if (!strcasecmp(q, "_self")) { - parsedtag_set_value(tag, - ATTR_TARGET, - s_target); - tag->need_reconstruct = TRUE; - } - else if (!strcasecmp(q, "_parent")) { - parsedtag_set_value(tag, - ATTR_TARGET, - p_target); - tag->need_reconstruct = TRUE; - } - } - else if (parsedtag_get_value(tag, ATTR_HREF, &q)) - a_target = 1; - - case HTML_FORM: - a_target = 1; - if (parsedtag_get_value(tag, ATTR_TARGET, &q)) { - a_target = 0; - if (!strcasecmp(q, "_self")) { - parsedtag_set_value(tag, - ATTR_TARGET, - s_target); - tag->need_reconstruct = TRUE; - } - else if (!strcasecmp(q, "_parent")) { - parsedtag_set_value(tag, - ATTR_TARGET, - p_target); - tag->need_reconstruct = TRUE; - } - } - break; default: break; --- 638,641 ---- *************** *** 685,688 **** --- 646,650 ---- case ATTR_HREF: case ATTR_ACTION: + a_target |= 1; if (!(tag->value[j] && strncasecmp(tag->value[j], *************** *** 693,696 **** --- 655,661 ---- parseURL2(tag->value[j], &url, &base); tag->value[j] = parsedURL2Str(&url)->ptr; + parsedtag_set_value(tag, + ATTR_REFERER, + parsedURL2Str(&base)->ptr); #ifdef JP_CHARSET if (code != '\0') { *************** *** 703,706 **** --- 668,687 ---- tag->need_reconstruct = TRUE; break; + case ATTR_TARGET: + a_target |= 2; + if (!strcasecmp(tag->value[j], "_self")) { + parsedtag_set_value(tag, + ATTR_TARGET, + s_target); + tag->need_reconstruct = TRUE; + } + else if (!strcasecmp(tag->value[j], + "_parent")) { + parsedtag_set_value(tag, + ATTR_TARGET, + p_target); + tag->need_reconstruct = TRUE; + } + break; case ATTR_NAME: case ATTR_ID: *************** *** 715,729 **** } if (a_target == 1) { ! /* there is HREF attribute and no * TARGET * attribute */ parsedtag_set_value(tag, ATTR_TARGET, d_target); - tag->need_reconstruct = TRUE; - } - if (is_anchor) { - parsedtag_set_value(tag, - ATTR_REFERER, - parsedURL2Str(&base)->ptr); tag->need_reconstruct = TRUE; } --- 696,704 ---- } if (a_target == 1) { ! /* there is HREF attribute and no TARGET * attribute */ parsedtag_set_value(tag, ATTR_TARGET, d_target); tag->need_reconstruct = TRUE; }
This archive was generated by hypermail 2b29 : Wed Dec 27 2000 - 00:10:19 CST