From eb44b171c3aeeeca0c7af5fde7be3cd1c7456795 Mon Sep 17 00:00:00 2001 From: Fumitoshi UKAI Date: Mon, 2 Dec 2002 17:27:34 +0000 Subject: [w3m-dev 03501] link tag support * buffer.c (reshapeBuffer): initialize formlist, linklist, maplist, hmarklist, imarklist * file.c (addLink): added (HTMLlineproc2body): add HTML_LINK (loadHTMLstream): use HTMLlineproc0 not in R_ST_NORMAL (reloadBuffer): initialize linklist, maplist, hmarklist, imarklist * fm.h (LINK_TYPE_NONE): added (LINK_TYPE_REL): added (LINK_TYPE_REV): added (LinkList): added (Buffer): add linklist * html.c (ALST_LINK): added (TagMAP): add link (AtrMAP): add rel, rev, title * html.h (HTML_LINK): added (ATTR_REL): added (ATTR_REV): added (ATTR_TITLE): added * map.c (append_map_info): anchor (append_link_info): added (page_info_panel): append_link_info * menu.c (LinkMenu): added (linkV): added (initLinkMenu): added (lmGoURL): added (popupMenu): initLinkMenu() (initMenu): w3mMenuList new 4 add "Link" * tagtable.tab (link): added From: Hironori SAKAMOTO --- map.c | 48 ++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 44 insertions(+), 4 deletions(-) (limited to 'map.c') diff --git a/map.c b/map.c index 5b11238..20fa090 100644 --- a/map.c +++ b/map.c @@ -1,4 +1,4 @@ -/* $Id: map.c,v 1.16 2002/11/25 17:10:52 ukai Exp $ */ +/* $Id: map.c,v 1.17 2002/12/02 17:27:39 ukai Exp $ */ /* * client-side image maps */ @@ -408,13 +408,49 @@ append_map_info(Buffer *buf, Str tmp, FormItemList *fi) continue; parseURL2(a->url, &pu, baseURL(buf)); url = html_quote(parsedURL2Str(&pu)->ptr); - Strcat_m_charp(tmp, "  ", - html_quote(a->alt), "", url, - "\n", NULL); + Strcat_m_charp(tmp, "  ", + html_quote(a->alt), "", html_quote(a->url), + "\n", NULL); } Strcat_charp(tmp, ""); } +/* append links */ +static void +append_link_info(Buffer *buf, Str html, LinkList *link) +{ + LinkList *l; + ParsedURL pu; + char *url; + + if (!link) + return; + + Strcat_charp(html, "

Link information

"); + Strcat_charp(html, "\n"); + for (l = link; l; l = l->next) { + if (l->url) { + parseURL2(l->url, &pu, baseURL(buf)); + url = html_quote(parsedURL2Str(&pu)->ptr); + } + else + url = "(empty)"; + Strcat_m_charp(html, "
", + l->title ? html_quote(l->title) : "(empty)", "", + NULL); + if (l->type == LINK_TYPE_REL) + Strcat_charp(html, "[Rel]"); + else if (l->type == LINK_TYPE_REV) + Strcat_charp(html, "[Rev]"); + Strcat_m_charp(html, "", l->url ? html_quote(l->url) : "(empty)", + NULL); + if (l->ctype) + Strcat_m_charp(html, " (", html_quote(l->ctype), ")", NULL); + Strcat_charp(html, "\n"); + } + Strcat_charp(html, "
\n"); +} + /* append frame URL */ static void append_frame_info(Buffer *buf, Str html, struct frameset *set, int level) @@ -539,6 +575,9 @@ page_info_panel(Buffer *buf) append_map_info(buf, tmp, fi->parent->item); } Strcat_charp(tmp, "\n"); + + append_link_info(buf, tmp, buf->linklist); + if (buf->document_header != NULL) { Strcat_charp(tmp, "
\n"); Strcat_charp(tmp, "

Header information

\n"); @@ -547,6 +586,7 @@ page_info_panel(Buffer *buf) Strcat_charp(tmp, "
"); } } + if (buf->frameset != NULL) f_set = buf->frameset; else if (buf->bufferprop & BP_FRAME && -- cgit v1.2.3