Using libParser to parse XML/HTML content
This commit is contained in:
parent
c9c7b27618
commit
ca2e1501f1
@ -44,7 +44,7 @@ struct _Conn
|
|||||||
int image;
|
int image;
|
||||||
|
|
||||||
/* callback */
|
/* callback */
|
||||||
ssize_t (*callback_write)(Conn *, char const *, ssize_t, gpointer);
|
ssize_t (*callback_write)(Conn *, char const *, size_t, gpointer);
|
||||||
gpointer callback_write_data;
|
gpointer callback_write_data;
|
||||||
|
|
||||||
/* http */
|
/* http */
|
||||||
@ -66,7 +66,7 @@ static void _conn_set_progress(Conn * conn, gdouble progress);
|
|||||||
static void _conn_set_status(Conn * conn, char const * status);
|
static void _conn_set_status(Conn * conn, char const * status);
|
||||||
|
|
||||||
static void _conn_set_callback_write(Conn * conn,
|
static void _conn_set_callback_write(Conn * conn,
|
||||||
ssize_t (*callback)(Conn *, char const *, ssize_t, gpointer),
|
ssize_t (*callback)(Conn *, char const *, size_t, gpointer),
|
||||||
gpointer data);
|
gpointer data);
|
||||||
|
|
||||||
/* useful */
|
/* useful */
|
||||||
@ -76,7 +76,7 @@ static int _conn_load(Conn * conn);
|
|||||||
|
|
||||||
/* functions */
|
/* functions */
|
||||||
/* conn_new */
|
/* conn_new */
|
||||||
static ssize_t _new_callback_write(Conn * conn, char const * buf, ssize_t size,
|
static ssize_t _new_callback_write(Conn * conn, char const * buf, size_t size,
|
||||||
gpointer data);
|
gpointer data);
|
||||||
|
|
||||||
static Conn * _conn_new(Surfer * surfer, char const * url, char const * post)
|
static Conn * _conn_new(Surfer * surfer, char const * url, char const * post)
|
||||||
@ -113,13 +113,11 @@ static Conn * _conn_new(Surfer * surfer, char const * url, char const * post)
|
|||||||
return conn;
|
return conn;
|
||||||
}
|
}
|
||||||
|
|
||||||
static ssize_t _new_callback_write(Conn * conn, char const * buf, ssize_t size,
|
static ssize_t _new_callback_write(Conn * conn, char const * buf, size_t size,
|
||||||
gpointer data)
|
gpointer data)
|
||||||
{
|
{
|
||||||
ssize_t ret;
|
ssize_t ret;
|
||||||
|
|
||||||
if(size < 0)
|
|
||||||
return -1;
|
|
||||||
if((ret = fwrite(buf, sizeof(*buf), size, data)) != size)
|
if((ret = fwrite(buf, sizeof(*buf), size, data)) != size)
|
||||||
return -1;
|
return -1;
|
||||||
return ret;
|
return ret;
|
||||||
@ -171,7 +169,7 @@ static void _conn_set_status(Conn * conn, char const * status)
|
|||||||
|
|
||||||
/* conn_set_callback_write */
|
/* conn_set_callback_write */
|
||||||
static void _conn_set_callback_write(Conn * conn,
|
static void _conn_set_callback_write(Conn * conn,
|
||||||
ssize_t (*callback)(Conn *, char const *, ssize_t, gpointer),
|
ssize_t (*callback)(Conn *, char const *, size_t, gpointer),
|
||||||
gpointer data)
|
gpointer data)
|
||||||
{
|
{
|
||||||
conn->callback_write = callback;
|
conn->callback_write = callback;
|
||||||
@ -268,6 +266,8 @@ static void _http_data_complete(GConnHttpEventData * event, Conn * conn)
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
conn->callback_write(conn, buf, size, conn->callback_write_data);
|
conn->callback_write(conn, buf, size, conn->callback_write_data);
|
||||||
|
/* FIXME find a more elegant way? */
|
||||||
|
conn->callback_write(conn, NULL, 0, conn->callback_write_data);
|
||||||
_http_data_progress(event, conn);
|
_http_data_progress(event, conn);
|
||||||
_conn_set_status(conn, NULL);
|
_conn_set_status(conn, NULL);
|
||||||
}
|
}
|
||||||
|
@ -16,7 +16,9 @@
|
|||||||
|
|
||||||
|
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
#include <errno.h>
|
||||||
#include <libintl.h>
|
#include <libintl.h>
|
||||||
|
#include <System/Parser/XML.h>
|
||||||
#include "ghtml.h"
|
#include "ghtml.h"
|
||||||
#include "../config.h"
|
#include "../config.h"
|
||||||
#include "common/conn.c"
|
#include "common/conn.c"
|
||||||
@ -41,10 +43,12 @@ typedef struct _GHtml
|
|||||||
|
|
||||||
/* connection */
|
/* connection */
|
||||||
Conn * conn;
|
Conn * conn;
|
||||||
|
char * buffer;
|
||||||
|
size_t buffer_cnt;
|
||||||
|
|
||||||
/* html widget */
|
/* html widget */
|
||||||
GtkWidget * view;
|
GtkWidget * view;
|
||||||
GtkTextBuffer * buffer;
|
GtkTextBuffer * tbuffer;
|
||||||
} GHtml;
|
} GHtml;
|
||||||
|
|
||||||
|
|
||||||
@ -69,12 +73,14 @@ GtkWidget * ghtml_new(Surfer * surfer)
|
|||||||
ghtml->history = NULL;
|
ghtml->history = NULL;
|
||||||
ghtml->current = NULL;
|
ghtml->current = NULL;
|
||||||
ghtml->conn = NULL;
|
ghtml->conn = NULL;
|
||||||
|
ghtml->buffer = NULL;
|
||||||
|
ghtml->buffer_cnt = 0;
|
||||||
widget = gtk_scrolled_window_new(NULL, NULL);
|
widget = gtk_scrolled_window_new(NULL, NULL);
|
||||||
g_object_set_data(G_OBJECT(widget), "ghtml", ghtml);
|
g_object_set_data(G_OBJECT(widget), "ghtml", ghtml);
|
||||||
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(widget),
|
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(widget),
|
||||||
GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
|
GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
|
||||||
ghtml->view = gtk_text_view_new();
|
ghtml->view = gtk_text_view_new();
|
||||||
ghtml->buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(ghtml->view));
|
ghtml->tbuffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(ghtml->view));
|
||||||
gtk_text_view_set_cursor_visible(GTK_TEXT_VIEW(ghtml->view),
|
gtk_text_view_set_cursor_visible(GTK_TEXT_VIEW(ghtml->view),
|
||||||
FALSE);
|
FALSE);
|
||||||
gtk_text_view_set_editable(GTK_TEXT_VIEW(ghtml->view), FALSE);
|
gtk_text_view_set_editable(GTK_TEXT_VIEW(ghtml->view), FALSE);
|
||||||
@ -91,6 +97,7 @@ void ghtml_delete(GtkWidget * widget)
|
|||||||
GHtml * ghtml;
|
GHtml * ghtml;
|
||||||
|
|
||||||
ghtml = g_object_get_data(G_OBJECT(widget), "ghtml");
|
ghtml = g_object_get_data(G_OBJECT(widget), "ghtml");
|
||||||
|
free(ghtml->buffer);
|
||||||
if(ghtml->conn != NULL)
|
if(ghtml->conn != NULL)
|
||||||
_conn_delete(ghtml->conn);
|
_conn_delete(ghtml->conn);
|
||||||
free(ghtml);
|
free(ghtml);
|
||||||
@ -152,14 +159,9 @@ gdouble ghtml_get_progress(GtkWidget * widget)
|
|||||||
char const * ghtml_get_source(GtkWidget * widget)
|
char const * ghtml_get_source(GtkWidget * widget)
|
||||||
{
|
{
|
||||||
GHtml * ghtml;
|
GHtml * ghtml;
|
||||||
GtkTextIter start;
|
|
||||||
GtkTextIter end;
|
|
||||||
|
|
||||||
ghtml = g_object_get_data(G_OBJECT(widget), "ghtml");
|
ghtml = g_object_get_data(G_OBJECT(widget), "ghtml");
|
||||||
/* FIXME leaks memory and will not always correspond to the source */
|
return ghtml->buffer;
|
||||||
gtk_text_buffer_get_start_iter(ghtml->buffer, &start);
|
|
||||||
gtk_text_buffer_get_end_iter(ghtml->buffer, &end);
|
|
||||||
return gtk_text_buffer_get_text(ghtml->buffer, &start, &end, FALSE);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -215,9 +217,9 @@ gboolean ghtml_find(GtkWidget * widget, char const * text, gboolean sensitive,
|
|||||||
return ret;
|
return ret;
|
||||||
ghtml = g_object_get_data(G_OBJECT(widget), "ghtml");
|
ghtml = g_object_get_data(G_OBJECT(widget), "ghtml");
|
||||||
/* XXX highly inefficient */
|
/* XXX highly inefficient */
|
||||||
gtk_text_buffer_get_start_iter(ghtml->buffer, &start);
|
gtk_text_buffer_get_start_iter(ghtml->tbuffer, &start);
|
||||||
gtk_text_buffer_get_end_iter(ghtml->buffer, &end);
|
gtk_text_buffer_get_end_iter(ghtml->tbuffer, &end);
|
||||||
buf = gtk_text_buffer_get_text(ghtml->buffer, &start, &end, FALSE);
|
buf = gtk_text_buffer_get_text(ghtml->tbuffer, &start, &end, FALSE);
|
||||||
if(buf == NULL || (blen = strlen(buf)) == 0)
|
if(buf == NULL || (blen = strlen(buf)) == 0)
|
||||||
return ret;
|
return ret;
|
||||||
if(ghtml->search >= blen)
|
if(ghtml->search >= blen)
|
||||||
@ -249,9 +251,9 @@ static gboolean _find_match(GHtml * ghtml, char const * buf, char const * str,
|
|||||||
|
|
||||||
offset = str - buf;
|
offset = str - buf;
|
||||||
ghtml->search = offset + 1;
|
ghtml->search = offset + 1;
|
||||||
gtk_text_buffer_get_iter_at_offset(ghtml->buffer, &start, offset);
|
gtk_text_buffer_get_iter_at_offset(ghtml->tbuffer, &start, offset);
|
||||||
gtk_text_buffer_get_iter_at_offset(ghtml->buffer, &end, offset + tlen);
|
gtk_text_buffer_get_iter_at_offset(ghtml->tbuffer, &end, offset + tlen);
|
||||||
gtk_text_buffer_select_range(ghtml->buffer, &start, &end);
|
gtk_text_buffer_select_range(ghtml->tbuffer, &start, &end);
|
||||||
gtk_text_view_scroll_to_iter(GTK_TEXT_VIEW(ghtml->view), &start, 0.0,
|
gtk_text_view_scroll_to_iter(GTK_TEXT_VIEW(ghtml->view), &start, 0.0,
|
||||||
FALSE, 0.0, 0.0);
|
FALSE, 0.0, 0.0);
|
||||||
return TRUE;
|
return TRUE;
|
||||||
@ -332,9 +334,9 @@ void ghtml_select_all(GtkWidget * widget)
|
|||||||
GtkTextIter end;
|
GtkTextIter end;
|
||||||
|
|
||||||
ghtml = g_object_get_data(G_OBJECT(widget), "ghtml");
|
ghtml = g_object_get_data(G_OBJECT(widget), "ghtml");
|
||||||
gtk_text_buffer_get_start_iter(ghtml->buffer, &start);
|
gtk_text_buffer_get_start_iter(ghtml->tbuffer, &start);
|
||||||
gtk_text_buffer_get_end_iter(ghtml->buffer, &end);
|
gtk_text_buffer_get_end_iter(ghtml->tbuffer, &end);
|
||||||
gtk_text_buffer_select_range(ghtml->buffer, &start, &end);
|
gtk_text_buffer_select_range(ghtml->tbuffer, &start, &end);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -345,8 +347,8 @@ void ghtml_unselect_all(GtkWidget * widget)
|
|||||||
GtkTextIter start;
|
GtkTextIter start;
|
||||||
|
|
||||||
ghtml = g_object_get_data(G_OBJECT(widget), "ghtml");
|
ghtml = g_object_get_data(G_OBJECT(widget), "ghtml");
|
||||||
gtk_text_buffer_get_start_iter(ghtml->buffer, &start);
|
gtk_text_buffer_get_start_iter(ghtml->tbuffer, &start);
|
||||||
gtk_text_buffer_select_range(ghtml->buffer, &start, &start);
|
gtk_text_buffer_select_range(ghtml->tbuffer, &start, &start);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -372,9 +374,10 @@ void ghtml_zoom_reset(GtkWidget * ghtml)
|
|||||||
|
|
||||||
|
|
||||||
/* functions */
|
/* functions */
|
||||||
static ssize_t _document_load_write(Conn * conn, char const * buf, ssize_t size,
|
static ssize_t _document_load_write(Conn * conn, char const * buf, size_t size,
|
||||||
gpointer data);
|
gpointer data);
|
||||||
static gboolean _document_load_idle(gpointer data);
|
static gboolean _document_load_idle(gpointer data);
|
||||||
|
static void _document_load_write_node(GHtml * ghtml, XMLNode * node);
|
||||||
|
|
||||||
static int _ghtml_document_load(GHtml * ghtml, char const * url,
|
static int _ghtml_document_load(GHtml * ghtml, char const * url,
|
||||||
char const * post)
|
char const * post)
|
||||||
@ -386,7 +389,10 @@ static int _ghtml_document_load(GHtml * ghtml, char const * url,
|
|||||||
return 1;
|
return 1;
|
||||||
ghtml->history = g_list_append(ghtml->history, h);
|
ghtml->history = g_list_append(ghtml->history, h);
|
||||||
ghtml->current = g_list_last(ghtml->history);
|
ghtml->current = g_list_last(ghtml->history);
|
||||||
gtk_text_buffer_set_text(ghtml->buffer, "", 0);
|
gtk_text_buffer_set_text(ghtml->tbuffer, "", 0);
|
||||||
|
free(ghtml->buffer);
|
||||||
|
ghtml->buffer = NULL;
|
||||||
|
ghtml->buffer_cnt = 0;
|
||||||
ghtml->search = 0;
|
ghtml->search = 0;
|
||||||
surfer_set_location(ghtml->surfer, url);
|
surfer_set_location(ghtml->surfer, url);
|
||||||
surfer_set_title(ghtml->surfer, NULL);
|
surfer_set_title(ghtml->surfer, NULL);
|
||||||
@ -397,15 +403,52 @@ static int _ghtml_document_load(GHtml * ghtml, char const * url,
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static ssize_t _document_load_write(Conn * conn, char const * buf, ssize_t size,
|
static ssize_t _document_load_write(Conn * conn, char const * buf, size_t size,
|
||||||
gpointer data)
|
gpointer data)
|
||||||
{
|
{
|
||||||
GHtml * ghtml = data;
|
GHtml * ghtml = data;
|
||||||
|
XML * xml;
|
||||||
|
XMLDocument * doc;
|
||||||
|
char * p;
|
||||||
|
|
||||||
|
if(size == 0)
|
||||||
|
{
|
||||||
|
if((xml = xml_new_string(ghtml->buffer, ghtml->buffer_cnt))
|
||||||
|
== NULL)
|
||||||
|
return 0;
|
||||||
|
if((doc = xml_get_document(xml)) != NULL)
|
||||||
|
_document_load_write_node(ghtml, doc->root);
|
||||||
|
xml_delete(xml);
|
||||||
|
}
|
||||||
|
if((p = realloc(ghtml->buffer, ghtml->buffer_cnt + size)) == NULL)
|
||||||
|
return -error_set_code(1, "%s", strerror(errno));
|
||||||
|
ghtml->buffer = p;
|
||||||
|
memcpy(&ghtml->buffer[ghtml->buffer_cnt], buf, size);
|
||||||
|
ghtml->buffer_cnt += size;
|
||||||
|
return size;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void _document_load_write_node(GHtml * ghtml, XMLNode * node)
|
||||||
|
{
|
||||||
|
size_t i;
|
||||||
GtkTextIter iter;
|
GtkTextIter iter;
|
||||||
|
|
||||||
gtk_text_buffer_get_end_iter(ghtml->buffer, &iter);
|
if(node == NULL)
|
||||||
gtk_text_buffer_insert(ghtml->buffer, &iter, buf, size);
|
return;
|
||||||
return size;
|
switch(node->type)
|
||||||
|
{
|
||||||
|
case XML_NODE_TYPE_DATA:
|
||||||
|
/* FIXME looks like memory corruption at some point */
|
||||||
|
gtk_text_buffer_get_end_iter(ghtml->tbuffer, &iter);
|
||||||
|
gtk_text_buffer_insert(ghtml->tbuffer, &iter,
|
||||||
|
node->data.buffer, node->data.size);
|
||||||
|
break;
|
||||||
|
case XML_NODE_TYPE_TAG:
|
||||||
|
for(i = 0; i < node->tag.childs_cnt; i++)
|
||||||
|
_document_load_write_node(ghtml,
|
||||||
|
node->tag.childs[i]);
|
||||||
|
break;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static gboolean _document_load_idle(gpointer data)
|
static gboolean _document_load_idle(gpointer data)
|
||||||
|
Loading…
Reference in New Issue
Block a user