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

document/dom: Move renderer-specific data from the generic struct dom_renderer

Browse Source 
This is hopefully the final step to have the specific renderers completely
separated and self-contained.
This commit is contained in:
Petr Baudis 2007-08-28 19:57:45 +02:00 committed by Petr Baudis
parent 91e512cca8
commit 46e44f9298
3 changed files with 103 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
src/document/dom/rss.c
View File

@ -26,11 +26,22 @@ enum rss_style {
RSS_STYLES, RSS_STYLES,
}; };
struct rss_renderer {
struct screen_char styles[RSS_STYLES];
struct dom_node *channel;
struct dom_node_list *items;
struct dom_node *item;
struct dom_node *node;
struct dom_string text;
};
static enum dom_code static enum dom_code
dom_rss_push_element(struct dom_stack *stack, struct dom_node *node, void *data) dom_rss_push_element(struct dom_stack *stack, struct dom_node *node, void *xxx)
{ {
struct dom_renderer *renderer = stack->current->data; struct dom_renderer *renderer = stack->current->data;
struct rss_renderer *data = renderer->data;
assert(node && renderer && renderer->document); assert(node && renderer && renderer->document);
@ -40,8 +51,8 @@ dom_rss_push_element(struct dom_stack *stack, struct dom_node *node, void *data)
if (stack->depth != 3) if (stack->depth != 3)
break; break;
if (!renderer->channel) { if (!data->channel) {
renderer->channel = node; data->channel = node;
} }
break; break;
@ -53,10 +64,10 @@ dom_rss_push_element(struct dom_stack *stack, struct dom_node *node, void *data)
break; break;
#endif #endif
/* ... but be exclusive. */ /* ... but be exclusive. */
if (renderer->item) if (data->item)
break; break;
add_to_dom_node_list(&renderer->items, node, -1); add_to_dom_node_list(&data->items, node, -1);
renderer->item = node; data->item = node;
break; break;
case RSS_ELEMENT_LINK: case RSS_ELEMENT_LINK:
@ -64,28 +75,29 @@ dom_rss_push_element(struct dom_stack *stack, struct dom_node *node, void *data)
case RSS_ELEMENT_TITLE: case RSS_ELEMENT_TITLE:
case RSS_ELEMENT_AUTHOR: case RSS_ELEMENT_AUTHOR:
case RSS_ELEMENT_PUBDATE: case RSS_ELEMENT_PUBDATE:
if (!node->parent || renderer->node != node->parent) if (!node->parent || data->node != node->parent)
break; break;
renderer->node = node; data->node = node;
} }
return DOM_CODE_OK; return DOM_CODE_OK;
} }
static enum dom_code static enum dom_code
dom_rss_pop_element(struct dom_stack *stack, struct dom_node *node, void *data) dom_rss_pop_element(struct dom_stack *stack, struct dom_node *node, void *xxx)
{ {
struct dom_renderer *renderer = stack->current->data; struct dom_renderer *renderer = stack->current->data;
struct rss_renderer *data = renderer->data;
struct dom_node_list **list; struct dom_node_list **list;
assert(node && renderer && renderer->document); assert(node && renderer && renderer->document);
switch (node->data.element.type) { switch (node->data.element.type) {
case RSS_ELEMENT_ITEM: case RSS_ELEMENT_ITEM:
if (is_dom_string_set(&renderer->text)) if (is_dom_string_set(&data->text))
done_dom_string(&renderer->text); done_dom_string(&data->text);
renderer->item = NULL; data->item = NULL;
break; break;
case RSS_ELEMENT_LINK: case RSS_ELEMENT_LINK:
@ -93,21 +105,21 @@ dom_rss_pop_element(struct dom_stack *stack, struct dom_node *node, void *data)
case RSS_ELEMENT_TITLE: case RSS_ELEMENT_TITLE:
case RSS_ELEMENT_AUTHOR: case RSS_ELEMENT_AUTHOR:
case RSS_ELEMENT_PUBDATE: case RSS_ELEMENT_PUBDATE:
if (!is_dom_string_set(&renderer->text) if (!is_dom_string_set(&data->text)
|| !node->parent || !node->parent
|| renderer->item != node->parent || data->item != node->parent
|| renderer->node != node) || data->node != node)
break; break;
/* Replace any child nodes with the normalized text node. /* Replace any child nodes with the normalized text node.
* We are getting rid of "inner HTML". */ * We are getting rid of "inner HTML". */
list = get_dom_node_list(node->parent, node); list = get_dom_node_list(node->parent, node);
done_dom_node_list(*list); done_dom_node_list(*list);
if (is_dom_string_set(&renderer->text)) { if (is_dom_string_set(&data->text)) {
if (!add_dom_node(node, DOM_NODE_TEXT, &renderer->text)) if (!add_dom_node(node, DOM_NODE_TEXT, &data->text))
done_dom_string(&renderer->text); done_dom_string(&data->text);
} }
renderer->node = NULL; data->node = NULL;
break; break;
default: default:
@ -133,13 +145,14 @@ get_rss_text(struct dom_node *node, enum rss_element_type type)
static void static void
render_rss_item(struct dom_renderer *renderer, struct dom_node *item) render_rss_item(struct dom_renderer *renderer, struct dom_node *item)
{ {
struct rss_renderer *data = renderer->data;
struct dom_string *title = get_rss_text(item, RSS_ELEMENT_TITLE); struct dom_string *title = get_rss_text(item, RSS_ELEMENT_TITLE);
struct dom_string *link = get_rss_text(item, RSS_ELEMENT_LINK); struct dom_string *link = get_rss_text(item, RSS_ELEMENT_LINK);
struct dom_string *author = get_rss_text(item, RSS_ELEMENT_AUTHOR); struct dom_string *author = get_rss_text(item, RSS_ELEMENT_AUTHOR);
struct dom_string *date = get_rss_text(item, RSS_ELEMENT_PUBDATE); struct dom_string *date = get_rss_text(item, RSS_ELEMENT_PUBDATE);
if (title && is_dom_string_set(title)) { if (title && is_dom_string_set(title)) {
if (item == renderer->channel) { if (item == data->channel) {
unsigned char *str; unsigned char *str;
str = convert_string(renderer->convert_table, str = convert_string(renderer->convert_table,
@ -149,7 +162,7 @@ render_rss_item(struct dom_renderer *renderer, struct dom_node *item)
if (str) if (str)
renderer->document->title = str; renderer->document->title = str;
} }
render_dom_text(renderer, &renderer->styles[RSS_STYLE_TITLE], render_dom_text(renderer, &data->styles[RSS_STYLE_TITLE],
title->string, title->length); title->string, title->length);
} }
@ -163,17 +176,17 @@ render_rss_item(struct dom_renderer *renderer, struct dom_node *item)
X(renderer) = 0; X(renderer) = 0;
if (author && is_dom_string_set(author)) { if (author && is_dom_string_set(author)) {
render_dom_text(renderer, &renderer->styles[RSS_STYLE_AUX], render_dom_text(renderer, &data->styles[RSS_STYLE_AUX],
author->string, author->length); author->string, author->length);
} }
if (date && is_dom_string_set(date)) { if (date && is_dom_string_set(date)) {
if (author && is_dom_string_set(author)) { if (author && is_dom_string_set(author)) {
render_dom_text(renderer, &renderer->styles[RSS_STYLE_AUX], render_dom_text(renderer, &data->styles[RSS_STYLE_AUX],
" - ", 3); " - ", 3);
} }
render_dom_text(renderer, &renderer->styles[RSS_STYLE_AUX], render_dom_text(renderer, &data->styles[RSS_STYLE_AUX],
date->string, date->length); date->string, date->length);
} }
@ -187,17 +200,20 @@ render_rss_item(struct dom_renderer *renderer, struct dom_node *item)
static enum dom_code static enum dom_code
dom_rss_push_document(struct dom_stack *stack, struct dom_node *root, void *data) dom_rss_push_document(struct dom_stack *stack, struct dom_node *root, void *xxx)
{ {
struct dom_renderer *renderer = stack->current->data; struct dom_renderer *renderer = stack->current->data;
struct css_stylesheet *css = &default_stylesheet; struct css_stylesheet *css = &default_stylesheet;
struct document *document = renderer->document; struct document *document = renderer->document;
struct rss_renderer *data;
enum rss_style type; enum rss_style type;
data = renderer->data = mem_calloc(1, sizeof(*data));
/* Initialize styles. */ /* Initialize styles. */
for (type = 0; type < RSS_STYLES; type++) { for (type = 0; type < RSS_STYLES; type++) {
struct screen_char *template = &renderer->styles[type]; struct screen_char *template = &data->styles[type];
color_T background = document->options.default_bg; color_T background = document->options.default_bg;
color_T foreground = document->options.default_fg; color_T foreground = document->options.default_fg;
enum screen_char_attr attr = 0; enum screen_char_attr attr = 0;
@ -230,32 +246,35 @@ dom_rss_push_document(struct dom_stack *stack, struct dom_node *root, void *data
} }
static enum dom_code static enum dom_code
dom_rss_pop_document(struct dom_stack *stack, struct dom_node *root, void *data) dom_rss_pop_document(struct dom_stack *stack, struct dom_node *root, void *xxx)
{ {
struct dom_renderer *renderer = stack->current->data; struct dom_renderer *renderer = stack->current->data;
struct rss_renderer *data = renderer->data;
if (!renderer->channel) if (!data->channel)
return DOM_CODE_OK; return DOM_CODE_OK;
render_rss_item(renderer, renderer->channel); render_rss_item(renderer, data->channel);
if (renderer->items) { if (data->items) {
struct dom_node *node; struct dom_node *node;
int index; int index;
foreach_dom_node (renderer->items, node, index) { foreach_dom_node (data->items, node, index) {
Y(renderer)++; Y(renderer)++;
X(renderer) = 0; X(renderer) = 0;
render_rss_item(renderer, node); render_rss_item(renderer, node);
} }
} }
if (is_dom_string_set(&renderer->text)) if (is_dom_string_set(&data->text))
done_dom_string(&renderer->text); done_dom_string(&data->text);
mem_free_if(renderer->items); mem_free_if(data->items);
done_dom_node(root); done_dom_node(root);
mem_free(data);
return DOM_CODE_OK; return DOM_CODE_OK;
} }

72
src/document/dom/source.c
View File

@ -48,10 +48,22 @@
#define URL_REGFLAGS (REG_ICASE | REG_EXTENDED) #define URL_REGFLAGS (REG_ICASE | REG_EXTENDED)
struct source_renderer {
#ifdef HAVE_REGEX_H
regex_t url_regex;
unsigned int find_url:1;
#endif
/* One style per node type. */
struct screen_char styles[DOM_NODES];
};
static inline void static inline void
render_dom_flush(struct dom_renderer *renderer, unsigned char *string) render_dom_flush(struct dom_renderer *renderer, unsigned char *string)
{ {
struct screen_char *template = &renderer->styles[DOM_NODE_TEXT]; struct source_renderer *data = renderer->data;
struct screen_char *template = &data->styles[DOM_NODE_TEXT];
int length = string - renderer->position; int length = string - renderer->position;
assert_source(renderer, renderer->position, 0); assert_source(renderer, renderer->position, 0);
@ -89,11 +101,12 @@ render_dom_node_text(struct dom_renderer *renderer, struct screen_char *template
static inline void static inline void
render_dom_node_enhanced_text(struct dom_renderer *renderer, struct dom_node *node) render_dom_node_enhanced_text(struct dom_renderer *renderer, struct dom_node *node)
{ {
regex_t *regex = &renderer->url_regex; struct source_renderer *data = renderer->data;
regex_t *regex = &data->url_regex;
regmatch_t regmatch; regmatch_t regmatch;
unsigned char *string = node->string.string; unsigned char *string = node->string.string;
int length = node->string.length; int length = node->string.length;
struct screen_char *template = &renderer->styles[node->type]; struct screen_char *template = &data->styles[node->type];
unsigned char *alloc_string; unsigned char *alloc_string;
if (check_dom_node_source(renderer, string, length)) { if (check_dom_node_source(renderer, string, length)) {
@ -133,42 +146,45 @@ render_dom_node_enhanced_text(struct dom_renderer *renderer, struct dom_node *no
#endif #endif
static enum dom_code static enum dom_code
render_dom_node_source(struct dom_stack *stack, struct dom_node *node, void *data) render_dom_node_source(struct dom_stack *stack, struct dom_node *node, void *xxx)
{ {
struct dom_renderer *renderer = stack->current->data; struct dom_renderer *renderer = stack->current->data;
struct source_renderer *data = renderer->data;
assert(node && renderer && renderer->document); assert(node && renderer && renderer->document);
#ifdef HAVE_REGEX_H #ifdef HAVE_REGEX_H
if (renderer->find_url if (data->find_url
&& (node->type == DOM_NODE_TEXT && (node->type == DOM_NODE_TEXT
|| node->type == DOM_NODE_CDATA_SECTION || node->type == DOM_NODE_CDATA_SECTION
|| node->type == DOM_NODE_COMMENT)) { || node->type == DOM_NODE_COMMENT)) {
render_dom_node_enhanced_text(renderer, node); render_dom_node_enhanced_text(renderer, node);
} else } else
#endif #endif
render_dom_node_text(renderer, &renderer->styles[node->type], node); render_dom_node_text(renderer, &data->styles[node->type], node);
return DOM_CODE_OK; return DOM_CODE_OK;
} }
/* This callback is also used for rendering processing instruction nodes. */ /* This callback is also used for rendering processing instruction nodes. */
static enum dom_code static enum dom_code
render_dom_element_source(struct dom_stack *stack, struct dom_node *node, void *data) render_dom_element_source(struct dom_stack *stack, struct dom_node *node, void *xxx)
{ {
struct dom_renderer *renderer = stack->current->data; struct dom_renderer *renderer = stack->current->data;
struct source_renderer *data = renderer->data;
assert(node && renderer && renderer->document); assert(node && renderer && renderer->document);
render_dom_node_text(renderer, &renderer->styles[node->type], node); render_dom_node_text(renderer, &data->styles[node->type], node);
return DOM_CODE_OK; return DOM_CODE_OK;
} }
static enum dom_code static enum dom_code
render_dom_element_end_source(struct dom_stack *stack, struct dom_node *node, void *data) render_dom_element_end_source(struct dom_stack *stack, struct dom_node *node, void *xxx)
{ {
struct dom_renderer *renderer = stack->current->data; struct dom_renderer *renderer = stack->current->data;
struct source_renderer *data = renderer->data;
struct dom_stack_state *state = get_dom_stack_top(stack); struct dom_stack_state *state = get_dom_stack_top(stack);
struct sgml_parser_state *pstate = get_dom_stack_state_data(stack->contexts[0], state); struct sgml_parser_state *pstate = get_dom_stack_state_data(stack->contexts[0], state);
struct dom_scanner_token *token = &pstate->end_token; struct dom_scanner_token *token = &pstate->end_token;
@ -186,7 +202,7 @@ render_dom_element_end_source(struct dom_stack *stack, struct dom_node *node, vo
assert_source(renderer, renderer->position, 0); assert_source(renderer, renderer->position, 0);
} }
render_dom_text(renderer, &renderer->styles[node->type], string, length); render_dom_text(renderer, &data->styles[node->type], string, length);
return DOM_CODE_OK; return DOM_CODE_OK;
} }
@ -213,10 +229,11 @@ set_base_uri(struct dom_renderer *renderer, unsigned char *value, size_t valuele
} }
static enum dom_code static enum dom_code
render_dom_attribute_source(struct dom_stack *stack, struct dom_node *node, void *data) render_dom_attribute_source(struct dom_stack *stack, struct dom_node *node, void *xxx)
{ {
struct dom_renderer *renderer = stack->current->data; struct dom_renderer *renderer = stack->current->data;
struct screen_char *template = &renderer->styles[node->type]; struct source_renderer *data = renderer->data;
struct screen_char *template = &data->styles[node->type];
assert(node && renderer->document); assert(node && renderer->document);
@ -288,9 +305,10 @@ render_dom_attribute_source(struct dom_stack *stack, struct dom_node *node, void
} }
static enum dom_code static enum dom_code
render_dom_cdata_source(struct dom_stack *stack, struct dom_node *node, void *data) render_dom_cdata_source(struct dom_stack *stack, struct dom_node *node, void *xxx)
{ {
struct dom_renderer *renderer = stack->current->data; struct dom_renderer *renderer = stack->current->data;
struct source_renderer *data = renderer->data;
unsigned char *string = node->string.string; unsigned char *string = node->string.string;
assert(node && renderer && renderer->document); assert(node && renderer && renderer->document);
@ -298,29 +316,32 @@ render_dom_cdata_source(struct dom_stack *stack, struct dom_node *node, void *da
/* Highlight the 'CDATA' part of <![CDATA[ if it is there. */ /* Highlight the 'CDATA' part of <![CDATA[ if it is there. */
if (check_dom_node_source(renderer, string - 6, 6)) { if (check_dom_node_source(renderer, string - 6, 6)) {
render_dom_flush(renderer, string - 6); render_dom_flush(renderer, string - 6);
render_dom_text(renderer, &renderer->styles[DOM_NODE_ATTRIBUTE], string - 6, 5); render_dom_text(renderer, &data->styles[DOM_NODE_ATTRIBUTE], string - 6, 5);
renderer->position = string - 1; renderer->position = string - 1;
assert_source(renderer, renderer->position, 0); assert_source(renderer, renderer->position, 0);
} }
render_dom_node_text(renderer, &renderer->styles[node->type], node); render_dom_node_text(renderer, &data->styles[node->type], node);
return DOM_CODE_OK; return DOM_CODE_OK;
} }
static enum dom_code static enum dom_code
render_dom_document_start(struct dom_stack *stack, struct dom_node *node, void *data) render_dom_document_start(struct dom_stack *stack, struct dom_node *node, void *xxx)
{ {
struct dom_renderer *renderer = stack->current->data; struct dom_renderer *renderer = stack->current->data;
struct css_stylesheet *css = &default_stylesheet; struct css_stylesheet *css = &default_stylesheet;
struct document *document = renderer->document; struct document *document = renderer->document;
struct source_renderer *data;
enum dom_node_type type; enum dom_node_type type;
data = renderer->data = mem_calloc(1, sizeof(*data));
/* Initialize styles for all the DOM node types. */ /* Initialize styles for all the DOM node types. */
for (type = 0; type < DOM_NODES; type++) { for (type = 0; type < DOM_NODES; type++) {
struct screen_char *template = &renderer->styles[type]; struct screen_char *template = &data->styles[type];
color_T background = document->options.default_bg; color_T background = document->options.default_bg;
color_T foreground = document->options.default_fg; color_T foreground = document->options.default_fg;
enum screen_char_attr attr = 0; enum screen_char_attr attr = 0;
@ -357,11 +378,11 @@ render_dom_document_start(struct dom_stack *stack, struct dom_node *node, void *
} }
#ifdef HAVE_REGEX_H #ifdef HAVE_REGEX_H
if (renderer->document->options.plain_display_links) { if (document->options.plain_display_links) {
if (regcomp(&renderer->url_regex, URL_REGEX, URL_REGFLAGS)) { if (regcomp(&data->url_regex, URL_REGEX, URL_REGFLAGS)) {
regfree(&renderer->url_regex); regfree(&data->url_regex);
} else { } else {
renderer->find_url = 1; data->find_url = 1;
} }
} }
#endif #endif
@ -370,9 +391,10 @@ render_dom_document_start(struct dom_stack *stack, struct dom_node *node, void *
} }
static enum dom_code static enum dom_code
render_dom_document_end(struct dom_stack *stack, struct dom_node *node, void *data) render_dom_document_end(struct dom_stack *stack, struct dom_node *node, void *xxx)
{ {
struct dom_renderer *renderer = stack->current->data; struct dom_renderer *renderer = stack->current->data;
struct source_renderer *data = renderer->data;
/* If there are no non-element nodes after the last element node make /* If there are no non-element nodes after the last element node make
* sure that we flush to the end of the cache entry source including * sure that we flush to the end of the cache entry source including
@ -382,10 +404,12 @@ render_dom_document_end(struct dom_stack *stack, struct dom_node *node, void *da
} }
#ifdef HAVE_REGEX_H #ifdef HAVE_REGEX_H
if (renderer->find_url) if (data->find_url)
regfree(&renderer->url_regex); regfree(&data->url_regex);
#endif #endif
mem_free(data);
return DOM_CODE_OK; return DOM_CODE_OK;
} }

16
src/document/dom/util.h
View File

@ -34,20 +34,8 @@ struct dom_renderer {
unsigned char *position; unsigned char *position;
int canvas_x, canvas_y; int canvas_x, canvas_y;
#ifdef HAVE_REGEX_H /* Renderer-specific data */
regex_t url_regex; void *data;
unsigned int find_url:1;
#endif
/* DOM_NODES is just an arbitrary size to fit everything for all the
* renderers. */
struct screen_char styles[DOM_NODES];
/* RSS renderer variables */
struct dom_node *channel;
struct dom_node_list *items;
struct dom_node *item;
struct dom_node *node;
struct dom_string text;
}; };
#define X(renderer) ((renderer)->canvas_x) #define X(renderer) ((renderer)->canvas_x)