DeforaOS/Surfer
DeforaOS/Surfer
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Implemented the <base> tag

Browse Source
This commit is contained in:
Pierre Pronchery 2010-11-09 14:42:54 +00:00
parent c1da5e6650
commit 98b7eb3c30
1 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/ghtml-gtktextview.c
View File

@ -69,6 +69,7 @@ typedef struct _GHtml
{ {
Surfer * surfer; Surfer * surfer;
char * title; char * title;
char * base;
/* history */ /* history */
GList * history; GList * history;
@ -298,6 +299,7 @@ GtkWidget * ghtml_new(Surfer * surfer)
return NULL; return NULL;
ghtml->surfer = surfer; ghtml->surfer = surfer;
ghtml->title = NULL; ghtml->title = NULL;
ghtml->base = NULL;
ghtml->history = NULL; ghtml->history = NULL;
ghtml->current = NULL; ghtml->current = NULL;
ghtml->conn = NULL; ghtml->conn = NULL;
@ -332,6 +334,7 @@ void ghtml_delete(GtkWidget * widget)
if(ghtml->conn != NULL) if(ghtml->conn != NULL)
_conn_delete(ghtml->conn); _conn_delete(ghtml->conn);
free(ghtml->title); free(ghtml->title);
free(ghtml->base);
free(ghtml->buffer); free(ghtml->buffer);
free(ghtml); free(ghtml);
} }
@ -528,7 +531,7 @@ void ghtml_load_url(GtkWidget * widget, char const * url)
gchar * link; gchar * link;
ghtml = g_object_get_data(G_OBJECT(widget), "ghtml"); ghtml = g_object_get_data(G_OBJECT(widget), "ghtml");
if((link = _ghtml_make_url(NULL, url)) != NULL) if((link = _ghtml_make_url(ghtml->base, url)) != NULL)
url = link; url = link;
_ghtml_document_load(ghtml, url, NULL); _ghtml_document_load(ghtml, url, NULL);
g_free(link); g_free(link);
@ -652,6 +655,8 @@ static int _ghtml_document_load(GHtml * ghtml, char const * url,
surfer_set_location(ghtml->surfer, url); surfer_set_location(ghtml->surfer, url);
free(ghtml->title); free(ghtml->title);
ghtml->title = NULL; ghtml->title = NULL;
free(ghtml->base);
ghtml->base = NULL;
surfer_set_title(ghtml->surfer, NULL); surfer_set_title(ghtml->surfer, NULL);
if((ghtml->conn = _conn_new(ghtml->surfer, url, post)) == NULL) if((ghtml->conn = _conn_new(ghtml->surfer, url, post)) == NULL)
return 1; return 1;
@ -750,6 +755,8 @@ static void _document_load_write_node_tag(GHtml * ghtml, XMLNodeTag * node)
GHtmlDisplay display = GHTML_DISPLAY_INLINE; GHtmlDisplay display = GHTML_DISPLAY_INLINE;
GtkTextIter iter; GtkTextIter iter;
GHtmlProperty const * p; GHtmlProperty const * p;
char const * q;
char * r;
ghtml->tag = NULL; ghtml->tag = NULL;
for(i = 0; i < GHTML_TAGS_COUNT; i++) for(i = 0; i < GHTML_TAGS_COUNT; i++)
@ -775,6 +782,17 @@ static void _document_load_write_node_tag(GHtml * ghtml, XMLNodeTag * node)
} }
if(strcmp(node->name, "head") == 0) if(strcmp(node->name, "head") == 0)
ghtml->position = GHTML_POSITION_HEAD; ghtml->position = GHTML_POSITION_HEAD;
else if(strcmp(node->name, "base") == 0)
{
if(ghtml->position == GHTML_POSITION_HEAD
&& (q = xml_node_get_attribute_value_by_name(
(XMLNode*)node, "href")) != NULL
&& (r = strdup(q)) != NULL)
{
free(ghtml->base);
ghtml->base = r;
}
}
else if(strcmp(node->name, "body") == 0) else if(strcmp(node->name, "body") == 0)
ghtml->position = GHTML_POSITION_BODY; ghtml->position = GHTML_POSITION_BODY;
else if(strcmp(node->name, "title") == 0) else if(strcmp(node->name, "title") == 0)