r12633 chris_y - /trunk/netsurf/image/jpeg.c
by netsurf＠semichrome.net
Author: chris_y
Date: Sun Jul 31 06:19:52 2011
New Revision: 12633
URL: http://source.netsurf-browser.org?rev=12633&view=rev
Log:
Redirect non-fatal errors to the NetSurf log
Modified:
trunk/netsurf/image/jpeg.c
Modified: trunk/netsurf/image/jpeg.c
URL: http://source.netsurf-browser.org/trunk/netsurf/image/jpeg.c?rev=12633&r1...
==============================================================================
--- trunk/netsurf/image/jpeg.c (original)
+++ trunk/netsurf/image/jpeg.c Sun Jul 31 06:19:52 2011
@@ -146,6 +146,21 @@
*/
static void nsjpeg_term_source(j_decompress_ptr cinfo)
{
+}
+
+
+/**
+ * Error output handler for JPEG library.
+ *
+ * This logs to NetSurf log instead of stderr.
+ * Warnings only - fatal errors are trapped by nsjpeg_error_exit
+ * and do not call the output handler.
+ */
+static void nsjpeg_error_log(j_common_ptr cinfo)
+{
+ struct nsjpeg_error_mgr *err = (struct nsjpeg_error_mgr *) cinfo->err;
+ err->pub.format_message(cinfo, nsjpeg_error_buffer);
+ LOG(("%s", nsjpeg_error_buffer));
}
@@ -187,6 +202,7 @@
cinfo.err = jpeg_std_error(&jerr.pub);
jerr.pub.error_exit = nsjpeg_error_exit;
+ jerr.pub.output_message = nsjpeg_error_log;
if (setjmp(jerr.setjmp_buffer)) {
jpeg_destroy_decompress(&cinfo);
if (bitmap)
11 years, 7 months
- 1
- 0
r12632 chris_y - /trunk/netsurf/!NetSurf/Resources/it/Messages
by netsurf＠semichrome.net
Author: chris_y
Date: Fri Jul 29 17:02:09 2011
New Revision: 12632
URL: http://source.netsurf-browser.org?rev=12632&view=rev
Log:
Update from Samir
Modified:
trunk/netsurf/!NetSurf/Resources/it/Messages
Modified: trunk/netsurf/!NetSurf/Resources/it/Messages
URL: http://source.netsurf-browser.org/trunk/netsurf/%21NetSurf/Resources/it/M...
==============================================================================
--- trunk/netsurf/!NetSurf/Resources/it/Messages (original)
+++ trunk/netsurf/!NetSurf/Resources/it/Messages Fri Jul 29 17:02:09 2011
@@ -1,6 +1,6 @@
-# Italian messages for NetSurf 2.7/3.0 Development (Revision 12559)
+# Italian messages for NetSurf 2.7/3.0 Development (Revision 12618)
# Translated by Samir Hawamdeh (http://www.betatesting.it/backforthefuture)
-# 16.07.2011
+# 27.07.2011
# =========================================================================
#
# Description
@@ -414,8 +414,8 @@
# Requesters
#
-amiSizeExisting:Existing file size:
-amiSizeNew:New file size:
+amiSizeExisting:Dimensione del file esistente:
+amiSizeNew:Nuova dimensione del file:
# GTK download window tokens
#
@@ -1467,4 +1467,4 @@
DitherImg:Immagini Dither
FilterImg:Immagini Smooth
RenderText:Sfuma testo di sfondo
-Initialising:Inizia...
+Initialising:Inizializzazione...
11 years, 7 months
- 1
- 0
r12631 chris_y - /trunk/netsurf/desktop/tree.c
by netsurf＠semichrome.net
Author: chris_y
Date: Thu Jul 28 14:29:43 2011
New Revision: 12631
URL: http://source.netsurf-browser.org?rev=12631&view=rev
Log:
Revert accidental change
Modified:
trunk/netsurf/desktop/tree.c
Modified: trunk/netsurf/desktop/tree.c
URL: http://source.netsurf-browser.org/trunk/netsurf/desktop/tree.c?rev=12631&...
==============================================================================
--- trunk/netsurf/desktop/tree.c (original)
+++ trunk/netsurf/desktop/tree.c Thu Jul 28 14:29:43 2011
@@ -1681,7 +1681,7 @@
}
x += NODE_INSTEP;
-// width -= NODE_INSTEP;
+ width -= NODE_INSTEP;
/* fall through */
case NODE_ELEMENT_TEXT:
11 years, 7 months
- 1
- 0
r12630 chris_y - /trunk/netsurf/desktop/tree.c
by netsurf＠semichrome.net
Author: chris_y
Date: Thu Jul 28 14:29:03 2011
New Revision: 12630
URL: http://source.netsurf-browser.org?rev=12630&view=rev
Log:
Fix memory leak
Modified:
trunk/netsurf/desktop/tree.c
Modified: trunk/netsurf/desktop/tree.c
URL: http://source.netsurf-browser.org/trunk/netsurf/desktop/tree.c?rev=12630&...
==============================================================================
--- trunk/netsurf/desktop/tree.c (original)
+++ trunk/netsurf/desktop/tree.c Thu Jul 28 14:29:03 2011
@@ -295,6 +295,7 @@
LOG(("Tree font width cache hit"));
#endif
} else {
+ if(cache_text != NULL) free(cache_text);
nsfont.font_width(&plot_fstyle,
element->text,
strlen(element->text),
@@ -1680,7 +1681,7 @@
}
x += NODE_INSTEP;
- width -= NODE_INSTEP;
+// width -= NODE_INSTEP;
/* fall through */
case NODE_ELEMENT_TEXT:
11 years, 7 months
- 1
- 0
r12629 jmb - in /trunk/netsurf: desktop/tree.c image/mng.c render/form.c render/html_interaction.c
by netsurf＠semichrome.net
Author: jmb
Date: Tue Jul 26 16:30:38 2011
New Revision: 12629
URL: http://source.netsurf-browser.org?rev=12629&view=rev
Log:
Fix GCC 4.6 warnings in core
Modified:
trunk/netsurf/desktop/tree.c
trunk/netsurf/image/mng.c
trunk/netsurf/render/form.c
trunk/netsurf/render/html_interaction.c
Modified: trunk/netsurf/desktop/tree.c
URL: http://source.netsurf-browser.org/trunk/netsurf/desktop/tree.c?rev=12629&...
==============================================================================
--- trunk/netsurf/desktop/tree.c (original)
+++ trunk/netsurf/desktop/tree.c Tue Jul 26 16:30:38 2011
@@ -476,11 +476,10 @@
bool recalculate_sizes)
{
struct node_element *element;
- int width, height;
+ int height;
assert(node != NULL);
- width = node->box.width;
height = node->box.height;
node->box.width = 0;
node->box.height = 0;
Modified: trunk/netsurf/image/mng.c
URL: http://source.netsurf-browser.org/trunk/netsurf/image/mng.c?rev=12629&r1=...
==============================================================================
--- trunk/netsurf/image/mng.c (original)
+++ trunk/netsurf/image/mng.c Tue Jul 26 16:30:38 2011
@@ -444,7 +444,6 @@
{
nsmng_content *mng = (nsmng_content *) c;
mng_retcode status;
- const char *data;
unsigned long size;
lwc_string *content_type;
bool match;
@@ -454,7 +453,7 @@
assert(c != NULL);
- data = content__get_source_data(c, &size);
+ content__get_source_data(c, &size);
/* by this point, the png should have been parsed
* and the bitmap created, so ensure that's the case
Modified: trunk/netsurf/render/form.c
URL: http://source.netsurf-browser.org/trunk/netsurf/render/form.c?rev=12629&r...
==============================================================================
--- trunk/netsurf/render/form.c (original)
+++ trunk/netsurf/render/form.c Tue Jul 26 16:30:38 2011
@@ -871,8 +871,7 @@
select_menu_redraw_callback callback,
struct content *c)
{
- int i, line_height_with_spacing, scroll;
- struct form_option *option;
+ int line_height_with_spacing;
struct box *box;
plot_font_style_t fstyle;
int total_height;
@@ -914,25 +913,9 @@
line_height_with_spacing;
menu->height = total_height;
- scroll = 0;
if (menu->height > MAX_SELECT_HEIGHT) {
menu->height = MAX_SELECT_HEIGHT;
-
- if (control->data.select.num_selected > 0) {
- i = 0;
- option = control->data.select.items;
- while (!option->selected) {
- option = option->next;
- i++;
- }
-
- if ((i + 1) * line_height_with_spacing >
- MAX_SELECT_HEIGHT)
- scroll = (i + 1) *
- line_height_with_spacing
- - MAX_SELECT_HEIGHT;
- }
}
menu->client_data = client_data;
menu->callback = callback;
Modified: trunk/netsurf/render/html_interaction.c
URL: http://source.netsurf-browser.org/trunk/netsurf/render/html_interaction.c...
==============================================================================
--- trunk/netsurf/render/html_interaction.c (original)
+++ trunk/netsurf/render/html_interaction.c Tue Jul 26 16:30:38 2011
@@ -236,8 +236,6 @@
while ((next_box = box_at_point(box, x, y, &box_x, &box_y, &content)) !=
NULL) {
- enum css_overflow_e overflow = CSS_OVERFLOW_VISIBLE;
-
box = next_box;
if (box->style && css_computed_visibility(box->style) ==
@@ -279,9 +277,6 @@
title = box->title;
pointer = get_pointer_shape(bw, box, false);
-
- if (box->style)
- overflow = css_computed_overflow(box->style);
if ((box->scroll_x != NULL || box->scroll_y != NULL) &&
drag_candidate == NULL)
11 years, 7 months
- 1
- 0
r12628 jmb - in /trunk/hubbub/src: tokeniser/ treebuilder/
by netsurf＠semichrome.net
Author: jmb
Date: Tue Jul 26 16:20:28 2011
New Revision: 12628
URL: http://source.netsurf-browser.org?rev=12628&view=rev
Log:
Fix build with GCC 4.6
Modified:
trunk/hubbub/src/tokeniser/tokeniser.c
trunk/hubbub/src/treebuilder/after_head.c
trunk/hubbub/src/treebuilder/generic_rcdata.c
trunk/hubbub/src/treebuilder/in_body.c
trunk/hubbub/src/treebuilder/in_caption.c
trunk/hubbub/src/treebuilder/in_cell.c
trunk/hubbub/src/treebuilder/in_column_group.c
trunk/hubbub/src/treebuilder/in_foreign_content.c
trunk/hubbub/src/treebuilder/in_frameset.c
trunk/hubbub/src/treebuilder/in_head.c
trunk/hubbub/src/treebuilder/in_head_noscript.c
trunk/hubbub/src/treebuilder/in_row.c
trunk/hubbub/src/treebuilder/in_select.c
trunk/hubbub/src/treebuilder/in_select_in_table.c
trunk/hubbub/src/treebuilder/in_table.c
trunk/hubbub/src/treebuilder/in_table_body.c
trunk/hubbub/src/treebuilder/treebuilder.c
Modified: trunk/hubbub/src/tokeniser/tokeniser.c
URL: http://source.netsurf-browser.org/trunk/hubbub/src/tokeniser/tokeniser.c?...
==============================================================================
--- trunk/hubbub/src/tokeniser/tokeniser.c (original)
+++ trunk/hubbub/src/tokeniser/tokeniser.c Tue Jul 26 16:20:28 2011
@@ -788,13 +788,16 @@
} else {
parserutils_error error;
const uint8_t *cptr = NULL;
+
error = parserutils_inputstream_peek(
tokeniser->input,
tokeniser->context.pending,
&cptr,
&len);
-
- assert(error == PARSERUTILS_OK);
+ if (error != PARSERUTILS_OK) {
+ return hubbub_error_from_parserutils_error(
+ error);
+ }
token.data.character.ptr = cptr;
token.data.character.len = len;
@@ -1586,8 +1589,10 @@
tokeniser->context.pending,
&cptr,
&len);
-
- assert(error == PARSERUTILS_OK);
+ if (error != PARSERUTILS_OK) {
+ return hubbub_error_from_parserutils_error(
+ error);
+ }
/* Insert the ampersand */
COLLECT_MS(attr->value, cptr, len);
@@ -3131,8 +3136,8 @@
assert(tokeniser->context.pending > 0);
error = parserutils_inputstream_peek(tokeniser->input, 0, &cptr, &len);
-
- assert(error == PARSERUTILS_OK);
+ if (error != PARSERUTILS_OK)
+ return hubbub_error_from_parserutils_error(error);
token.type = HUBBUB_TOKEN_CHARACTER;
token.data.character.ptr = cptr;
Modified: trunk/hubbub/src/treebuilder/after_head.c
URL: http://source.netsurf-browser.org/trunk/hubbub/src/treebuilder/after_head...
==============================================================================
--- trunk/hubbub/src/treebuilder/after_head.c (original)
+++ trunk/hubbub/src/treebuilder/after_head.c Tue Jul 26 16:20:28 2011
@@ -62,7 +62,6 @@
element_type otype;
void *node;
uint32_t index;
- hubbub_error e;
/** \todo parse error */
@@ -78,10 +77,8 @@
/* Process as "in head" */
err = handle_in_head(treebuilder, token);
- e = element_stack_remove(treebuilder, index,
+ element_stack_remove(treebuilder, index,
&ns, &otype, &node);
- /* Can't result in error -- ensure this. */
- assert(e == HUBBUB_OK);
/* No need to unref node as we never increased
* its reference count when pushing it on the stack */
Modified: trunk/hubbub/src/treebuilder/generic_rcdata.c
URL: http://source.netsurf-browser.org/trunk/hubbub/src/treebuilder/generic_rc...
==============================================================================
--- trunk/hubbub/src/treebuilder/generic_rcdata.c (original)
+++ trunk/hubbub/src/treebuilder/generic_rcdata.c Tue Jul 26 16:20:28 2011
@@ -85,14 +85,12 @@
}
if (done) {
- hubbub_error e;
hubbub_ns ns;
element_type otype;
void *node;
/* Pop the current node from the stack */
- e = element_stack_pop(treebuilder, &ns, &otype, &node);
- assert(e == HUBBUB_OK);
+ element_stack_pop(treebuilder, &ns, &otype, &node);
treebuilder->tree_handler->unref_node(
treebuilder->tree_handler->ctx,
Modified: trunk/hubbub/src/treebuilder/in_body.c
URL: http://source.netsurf-browser.org/trunk/hubbub/src/treebuilder/in_body.c?...
==============================================================================
--- trunk/hubbub/src/treebuilder/in_body.c (original)
+++ trunk/hubbub/src/treebuilder/in_body.c Tue Jul 26 16:20:28 2011
@@ -827,18 +827,15 @@
treebuilder->context.current_node].node,
treebuilder->context.current_node);
if (err != HUBBUB_OK) {
- hubbub_error e;
hubbub_ns ns;
element_type type;
void *node;
- e = remove_node_from_dom(treebuilder,
+ remove_node_from_dom(treebuilder,
treebuilder->context.element_stack[
treebuilder->context.current_node].node);
- assert(e == HUBBUB_OK);
-
- e = element_stack_pop(treebuilder, &ns, &type, &node);
- assert(e == HUBBUB_OK);
+
+ element_stack_pop(treebuilder, &ns, &type, &node);
/* Unref twice (once for stack, once for formatting list) */
treebuilder->tree_handler->unref_node(
@@ -883,18 +880,15 @@
treebuilder->context.current_node].node,
treebuilder->context.current_node);
if (err != HUBBUB_OK) {
- hubbub_error e;
hubbub_ns ns;
element_type type;
void *node;
- e = remove_node_from_dom(treebuilder,
+ remove_node_from_dom(treebuilder,
treebuilder->context.element_stack[
treebuilder->context.current_node].node);
- assert(e == HUBBUB_OK);
-
- e = element_stack_pop(treebuilder, &ns, &type, &node);
- assert(e == HUBBUB_OK);
+
+ element_stack_pop(treebuilder, &ns, &type, &node);
/* Unref twice (once for stack, once for formatting list) */
treebuilder->tree_handler->unref_node(
@@ -952,18 +946,15 @@
treebuilder->context.current_node].node,
treebuilder->context.current_node);
if (err != HUBBUB_OK) {
- hubbub_error e;
hubbub_ns ns;
element_type type;
void *node;
- e = remove_node_from_dom(treebuilder,
+ remove_node_from_dom(treebuilder,
treebuilder->context.element_stack[
treebuilder->context.current_node].node);
- assert(e == HUBBUB_OK);
-
- e = element_stack_pop(treebuilder, &ns, &type, &node);
- assert(e == HUBBUB_OK);
+
+ element_stack_pop(treebuilder, &ns, &type, &node);
/* Unref twice (once for stack, once for formatting list) */
treebuilder->tree_handler->unref_node(
@@ -1016,18 +1007,15 @@
treebuilder->context.current_node].node,
treebuilder->context.current_node);
if (err != HUBBUB_OK) {
- hubbub_error e;
hubbub_ns ns;
element_type type;
void *node;
- e = remove_node_from_dom(treebuilder,
+ remove_node_from_dom(treebuilder,
treebuilder->context.element_stack[
treebuilder->context.current_node].node);
- assert(e == HUBBUB_OK);
-
- e = element_stack_pop(treebuilder, &ns, &type, &node);
- assert(e == HUBBUB_OK);
+
+ element_stack_pop(treebuilder, &ns, &type, &node);
/* Unref twice (once for stack, once for formatting list) */
treebuilder->tree_handler->unref_node(
@@ -1075,18 +1063,15 @@
treebuilder->context.current_node].node,
treebuilder->context.current_node);
if (err != HUBBUB_OK) {
- hubbub_error e;
hubbub_ns ns;
element_type type;
void *node;
- e = remove_node_from_dom(treebuilder,
+ remove_node_from_dom(treebuilder,
treebuilder->context.element_stack[
treebuilder->context.current_node].node);
- assert(e == HUBBUB_OK);
-
- e = element_stack_pop(treebuilder, &ns, &type, &node);
- assert(e == HUBBUB_OK);
+
+ element_stack_pop(treebuilder, &ns, &type, &node);
/* Unref twice (once for stack, once for formatting list) */
treebuilder->tree_handler->unref_node(
@@ -1467,12 +1452,10 @@
close_implied_end_tags(treebuilder, UNKNOWN);
do {
- hubbub_error e;
hubbub_ns ns;
void *node;
- e = element_stack_pop(treebuilder, &ns, &otype, &node);
- assert(e == HUBBUB_OK);
+ element_stack_pop(treebuilder, &ns, &otype, &node);
treebuilder->tree_handler->unref_node(
treebuilder->tree_handler->ctx,
@@ -1496,7 +1479,6 @@
*/
hubbub_error process_0form_in_body(hubbub_treebuilder *treebuilder)
{
- hubbub_error err;
void *node = treebuilder->context.form_element;
uint32_t idx = 0;
@@ -1524,9 +1506,8 @@
/** \todo parse error */
}
- err = element_stack_remove(treebuilder, idx,
+ element_stack_remove(treebuilder, idx,
&ns, &otype, &onode);
- assert(err == HUBBUB_OK);
treebuilder->tree_handler->unref_node(
treebuilder->tree_handler->ctx,
@@ -1599,8 +1580,6 @@
hubbub_error process_0dd_dt_li_in_body(hubbub_treebuilder *treebuilder,
element_type type)
{
- hubbub_error err;
-
if (!element_in_scope(treebuilder, type, false)) {
/** \todo parse error */
} else {
@@ -1613,9 +1592,8 @@
hubbub_ns ns;
void *node;
- err = element_stack_pop(treebuilder,
+ element_stack_pop(treebuilder,
&ns, &otype, &node);
- assert(err == HUBBUB_OK);
treebuilder->tree_handler->unref_node(
treebuilder->tree_handler->ctx,
@@ -1656,12 +1634,10 @@
close_implied_end_tags(treebuilder, UNKNOWN);
do {
- hubbub_error e;
hubbub_ns ns;
void *node;
- e = element_stack_pop(treebuilder, &ns, &otype, &node);
- assert(e == HUBBUB_OK);
+ element_stack_pop(treebuilder, &ns, &otype, &node);
treebuilder->tree_handler->unref_node(
treebuilder->tree_handler->ctx,
@@ -1897,7 +1873,6 @@
if (entry->stack_index == 0) {
/* Not in element stack => remove from formatting list */
- hubbub_error e;
hubbub_ns ns;
element_type type;
void *node;
@@ -1905,9 +1880,8 @@
/** \todo parse error */
- e = formatting_list_remove(treebuilder, entry,
+ formatting_list_remove(treebuilder, entry,
&ns, &type, &node, &index);
- assert(e == HUBBUB_OK);
treebuilder->tree_handler->unref_node(
treebuilder->tree_handler->ctx, node);
@@ -1976,7 +1950,6 @@
}
if (fb > treebuilder->context.current_node) {
- hubbub_error e;
hubbub_ns ns;
element_type type;
void *node;
@@ -1985,8 +1958,7 @@
/* Pop all elements off the stack up to,
* and including, the formatting element */
do {
- e = element_stack_pop(treebuilder, &ns, &type, &node);
- assert(e == HUBBUB_OK);
+ element_stack_pop(treebuilder, &ns, &type, &node);
treebuilder->tree_handler->unref_node(
treebuilder->tree_handler->ctx,
@@ -1994,9 +1966,8 @@
} while (treebuilder->context.current_node >= fe_index);
/* Remove the formatting element from the list */
- e = formatting_list_remove(treebuilder, formatting_element,
+ formatting_list_remove(treebuilder, formatting_element,
&ns, &type, &node, &index);
- assert(e == HUBBUB_OK);
treebuilder->tree_handler->unref_node(
treebuilder->tree_handler->ctx, node);
@@ -2339,12 +2310,10 @@
close_implied_end_tags(treebuilder, UNKNOWN);
do {
- hubbub_error e;
hubbub_ns ns;
void *node;
- e = element_stack_pop(treebuilder, &ns, &otype, &node);
- assert(e == HUBBUB_OK);
+ element_stack_pop(treebuilder, &ns, &otype, &node);
treebuilder->tree_handler->unref_node(
treebuilder->tree_handler->ctx,
@@ -2411,13 +2380,11 @@
close_implied_end_tags(treebuilder, UNKNOWN);
while (treebuilder->context.current_node >= node) {
- hubbub_error e;
hubbub_ns ns;
void *node;
- e = element_stack_pop(treebuilder,
+ element_stack_pop(treebuilder,
&ns, &otype, &node);
- assert(e == HUBBUB_OK);
treebuilder->tree_handler->unref_node(
treebuilder->tree_handler->ctx,
Modified: trunk/hubbub/src/treebuilder/in_caption.c
URL: http://source.netsurf-browser.org/trunk/hubbub/src/treebuilder/in_caption...
==============================================================================
--- trunk/hubbub/src/treebuilder/in_caption.c (original)
+++ trunk/hubbub/src/treebuilder/in_caption.c Tue Jul 26 16:20:28 2011
@@ -76,7 +76,6 @@
}
if (handled || err == HUBBUB_REPROCESS) {
- hubbub_error e;
hubbub_ns ns;
element_type otype = UNKNOWN;
void *node;
@@ -88,8 +87,7 @@
while (otype != CAPTION) {
/** \todo parse error */
- e = element_stack_pop(treebuilder, &ns, &otype, &node);
- assert(e == HUBBUB_OK);
+ element_stack_pop(treebuilder, &ns, &otype, &node);
treebuilder->tree_handler->unref_node(
treebuilder->tree_handler->ctx,
Modified: trunk/hubbub/src/treebuilder/in_cell.c
URL: http://source.netsurf-browser.org/trunk/hubbub/src/treebuilder/in_cell.c?...
==============================================================================
--- trunk/hubbub/src/treebuilder/in_cell.c (original)
+++ trunk/hubbub/src/treebuilder/in_cell.c Tue Jul 26 16:20:28 2011
@@ -21,7 +21,6 @@
*/
static inline void close_cell(hubbub_treebuilder *treebuilder)
{
- hubbub_error e;
hubbub_ns ns;
element_type otype = UNKNOWN;
void *node;
@@ -40,8 +39,7 @@
/** \todo parse error */
while (otype != type) {
- e = element_stack_pop(treebuilder, &ns, &otype, &node);
- assert(e == HUBBUB_OK);
+ element_stack_pop(treebuilder, &ns, &otype, &node);
treebuilder->tree_handler->unref_node(
treebuilder->tree_handler->ctx,
@@ -92,7 +90,6 @@
if (type == TH || type == TD) {
if (element_in_scope(treebuilder, type, true)) {
- hubbub_error e;
hubbub_ns ns;
element_type otype = UNKNOWN;
void *node;
@@ -101,9 +98,8 @@
/** \todo parse error */
while (otype != type) {
- e = element_stack_pop(treebuilder,
+ element_stack_pop(treebuilder,
&ns, &otype, &node);
- assert(e == HUBBUB_OK);
treebuilder->tree_handler->unref_node(
treebuilder->tree_handler->ctx,
Modified: trunk/hubbub/src/treebuilder/in_column_group.c
URL: http://source.netsurf-browser.org/trunk/hubbub/src/treebuilder/in_column_...
==============================================================================
--- trunk/hubbub/src/treebuilder/in_column_group.c (original)
+++ trunk/hubbub/src/treebuilder/in_column_group.c Tue Jul 26 16:20:28 2011
@@ -80,14 +80,12 @@
}
if (handled || err == HUBBUB_REPROCESS) {
- hubbub_error e;
hubbub_ns ns;
element_type otype;
void *node;
/* Pop the current node (which will be a colgroup) */
- e = element_stack_pop(treebuilder, &ns, &otype, &node);
- assert(e == HUBBUB_OK);
+ element_stack_pop(treebuilder, &ns, &otype, &node);
treebuilder->tree_handler->unref_node(
treebuilder->tree_handler->ctx,
Modified: trunk/hubbub/src/treebuilder/in_foreign_content.c
URL: http://source.netsurf-browser.org/trunk/hubbub/src/treebuilder/in_foreign...
==============================================================================
--- trunk/hubbub/src/treebuilder/in_foreign_content.c (original)
+++ trunk/hubbub/src/treebuilder/in_foreign_content.c Tue Jul 26 16:20:28 2011
@@ -365,13 +365,11 @@
while (stack[treebuilder->context.current_node].ns !=
HUBBUB_NS_HTML) {
- hubbub_error e;
hubbub_ns ns;
element_type type;
void *node;
- e = element_stack_pop(treebuilder, &ns, &type, &node);
- assert(e == HUBBUB_OK);
+ element_stack_pop(treebuilder, &ns, &type, &node);
treebuilder->tree_handler->unref_node(
treebuilder->tree_handler->ctx,
Modified: trunk/hubbub/src/treebuilder/in_frameset.c
URL: http://source.netsurf-browser.org/trunk/hubbub/src/treebuilder/in_framese...
==============================================================================
--- trunk/hubbub/src/treebuilder/in_frameset.c (original)
+++ trunk/hubbub/src/treebuilder/in_frameset.c Tue Jul 26 16:20:28 2011
@@ -71,7 +71,6 @@
&token->data.tag.name);
if (type == FRAMESET) {
- hubbub_error e;
hubbub_ns ns;
void *node;
@@ -81,8 +80,7 @@
break;
}
- e = element_stack_pop(treebuilder, &ns, &type, &node);
- assert(e == HUBBUB_OK);
+ element_stack_pop(treebuilder, &ns, &type, &node);
treebuilder->tree_handler->unref_node(
treebuilder->tree_handler->ctx,
Modified: trunk/hubbub/src/treebuilder/in_head.c
URL: http://source.netsurf-browser.org/trunk/hubbub/src/treebuilder/in_head.c?...
==============================================================================
--- trunk/hubbub/src/treebuilder/in_head.c (original)
+++ trunk/hubbub/src/treebuilder/in_head.c Tue Jul 26 16:20:28 2011
@@ -186,13 +186,11 @@
}
if (handled || err == HUBBUB_REPROCESS) {
- hubbub_error e;
hubbub_ns ns;
element_type otype;
void *node;
- e = element_stack_pop(treebuilder, &ns, &otype, &node);
- assert(e == HUBBUB_OK);
+ element_stack_pop(treebuilder, &ns, &otype, &node);
treebuilder->tree_handler->unref_node(
treebuilder->tree_handler->ctx,
Modified: trunk/hubbub/src/treebuilder/in_head_noscript.c
URL: http://source.netsurf-browser.org/trunk/hubbub/src/treebuilder/in_head_no...
==============================================================================
--- trunk/hubbub/src/treebuilder/in_head_noscript.c (original)
+++ trunk/hubbub/src/treebuilder/in_head_noscript.c Tue Jul 26 16:20:28 2011
@@ -82,13 +82,11 @@
}
if (handled || err == HUBBUB_REPROCESS) {
- hubbub_error e;
hubbub_ns ns;
element_type otype;
void *node;
- e = element_stack_pop(treebuilder, &ns, &otype, &node);
- assert(e == HUBBUB_OK);
+ element_stack_pop(treebuilder, &ns, &otype, &node);
treebuilder->tree_handler->unref_node(
treebuilder->tree_handler->ctx,
Modified: trunk/hubbub/src/treebuilder/in_row.c
URL: http://source.netsurf-browser.org/trunk/hubbub/src/treebuilder/in_row.c?r...
==============================================================================
--- trunk/hubbub/src/treebuilder/in_row.c (original)
+++ trunk/hubbub/src/treebuilder/in_row.c Tue Jul 26 16:20:28 2011
@@ -24,13 +24,11 @@
element_type cur_node = current_node(treebuilder);
while (cur_node != TR && cur_node != HTML) {
- hubbub_error e;
hubbub_ns ns;
element_type type;
void *node;
- e = element_stack_pop(treebuilder, &ns, &type, &node);
- assert(e == HUBBUB_OK);
+ element_stack_pop(treebuilder, &ns, &type, &node);
treebuilder->tree_handler->unref_node(
treebuilder->tree_handler->ctx,
@@ -51,7 +49,6 @@
*/
static hubbub_error act_as_if_end_tag_tr(hubbub_treebuilder *treebuilder)
{
- hubbub_error e;
hubbub_ns ns;
element_type otype;
void *node;
@@ -60,8 +57,7 @@
table_clear_stack(treebuilder);
- e = element_stack_pop(treebuilder, &ns, &otype, &node);
- assert(e == HUBBUB_OK);
+ element_stack_pop(treebuilder, &ns, &otype, &node);
treebuilder->tree_handler->unref_node(treebuilder->tree_handler->ctx,
node);
@@ -112,21 +108,17 @@
treebuilder->context.current_node].node,
treebuilder->context.current_node);
if (err != HUBBUB_OK) {
- hubbub_error e;
hubbub_ns ns;
element_type type;
void *node;
/* Revert changes */
- e = remove_node_from_dom(treebuilder,
+ remove_node_from_dom(treebuilder,
treebuilder->context.element_stack[
treebuilder->context.current_node].node);
- assert(e == HUBBUB_OK);
-
- e = element_stack_pop(treebuilder, &ns, &type,
+ element_stack_pop(treebuilder, &ns, &type,
&node);
- assert(e == HUBBUB_OK);
return err;
}
Modified: trunk/hubbub/src/treebuilder/in_select.c
URL: http://source.netsurf-browser.org/trunk/hubbub/src/treebuilder/in_select....
==============================================================================
--- trunk/hubbub/src/treebuilder/in_select.c (original)
+++ trunk/hubbub/src/treebuilder/in_select.c Tue Jul 26 16:20:28 2011
@@ -52,10 +52,8 @@
err = handle_in_body(treebuilder, token);
} else if (type == OPTION) {
if (current_node(treebuilder) == OPTION) {
- hubbub_error e;
- e = element_stack_pop(treebuilder, &ns, &otype,
+ element_stack_pop(treebuilder, &ns, &otype,
&node);
- assert(e == HUBBUB_OK);
treebuilder->tree_handler->unref_node(
treebuilder->tree_handler->ctx,
@@ -66,10 +64,8 @@
true);
} else if (type == OPTGROUP) {
if (current_node(treebuilder) == OPTION) {
- hubbub_error e;
- e = element_stack_pop(treebuilder, &ns, &otype,
+ element_stack_pop(treebuilder, &ns, &otype,
&node);
- assert(e == HUBBUB_OK);
treebuilder->tree_handler->unref_node(
treebuilder->tree_handler->ctx,
@@ -77,10 +73,8 @@
}
if (current_node(treebuilder) == OPTGROUP) {
- hubbub_error e;
- e = element_stack_pop(treebuilder, &ns, &otype,
+ element_stack_pop(treebuilder, &ns, &otype,
&node);
- assert(e == HUBBUB_OK);
treebuilder->tree_handler->unref_node(
treebuilder->tree_handler->ctx,
@@ -93,10 +87,8 @@
type == TEXTAREA) {
if (element_in_scope(treebuilder, SELECT, true)) {
- hubbub_error e;
- e = element_stack_pop_until(treebuilder,
+ element_stack_pop_until(treebuilder,
SELECT);
- assert(e == HUBBUB_OK);
reset_insertion_mode(treebuilder);
} else {
/* fragment case */
@@ -120,10 +112,8 @@
if (type == OPTGROUP) {
if (current_node(treebuilder) == OPTION &&
prev_node(treebuilder) == OPTGROUP) {
- hubbub_error e;
- e = element_stack_pop(treebuilder, &ns, &otype,
+ element_stack_pop(treebuilder, &ns, &otype,
&node);
- assert(e == HUBBUB_OK);
treebuilder->tree_handler->unref_node(
treebuilder->tree_handler->ctx,
@@ -131,10 +121,8 @@
}
if (current_node(treebuilder) == OPTGROUP) {
- hubbub_error e;
- e = element_stack_pop(treebuilder, &ns, &otype,
+ element_stack_pop(treebuilder, &ns, &otype,
&node);
- assert(e == HUBBUB_OK);
treebuilder->tree_handler->unref_node(
treebuilder->tree_handler->ctx,
@@ -144,10 +132,8 @@
}
} else if (type == OPTION) {
if (current_node(treebuilder) == OPTION) {
- hubbub_error e;
- e = element_stack_pop(treebuilder, &ns, &otype,
+ element_stack_pop(treebuilder, &ns, &otype,
&node);
- assert(e == HUBBUB_OK);
treebuilder->tree_handler->unref_node(
treebuilder->tree_handler->ctx,
@@ -157,10 +143,8 @@
}
} else if (type == SELECT) {
if (element_in_scope(treebuilder, SELECT, true)) {
- hubbub_error e;
- e = element_stack_pop_until(treebuilder,
+ element_stack_pop_until(treebuilder,
SELECT);
- assert(e == HUBBUB_OK);
reset_insertion_mode(treebuilder);
} else {
/* fragment case */
Modified: trunk/hubbub/src/treebuilder/in_select_in_table.c
URL: http://source.netsurf-browser.org/trunk/hubbub/src/treebuilder/in_select_...
==============================================================================
--- trunk/hubbub/src/treebuilder/in_select_in_table.c (original)
+++ trunk/hubbub/src/treebuilder/in_select_in_table.c Tue Jul 26 16:20:28 2011
@@ -43,13 +43,10 @@
element_in_scope(treebuilder, type,
true)) ||
token->type == HUBBUB_TOKEN_START_TAG) {
- hubbub_error e;
-
/** \todo fragment case */
- e = element_stack_pop_until(treebuilder,
+ element_stack_pop_until(treebuilder,
SELECT);
- assert(e == HUBBUB_OK);
reset_insertion_mode(treebuilder);
err = HUBBUB_REPROCESS;
}
Modified: trunk/hubbub/src/treebuilder/in_table.c
URL: http://source.netsurf-browser.org/trunk/hubbub/src/treebuilder/in_table.c...
==============================================================================
--- trunk/hubbub/src/treebuilder/in_table.c (original)
+++ trunk/hubbub/src/treebuilder/in_table.c Tue Jul 26 16:20:28 2011
@@ -27,10 +27,7 @@
void *node;
while (type != TABLE && type != HTML) {
- hubbub_error e;
-
- e = element_stack_pop(treebuilder, &ns, &type, &node);
- assert(e == HUBBUB_OK);
+ element_stack_pop(treebuilder, &ns, &type, &node);
treebuilder->tree_handler->unref_node(
treebuilder->tree_handler->ctx,
@@ -133,16 +130,14 @@
err = insert_element(treebuilder, &token->data.tag,
true);
if (err != HUBBUB_OK) {
- hubbub_error e;
hubbub_ns ns;
element_type type;
void *node;
uint32_t index;
- e = formatting_list_remove(treebuilder,
+ formatting_list_remove(treebuilder,
treebuilder->context.formatting_list_end,
&ns, &type, &node, &index);
- assert(e == HUBBUB_OK);
treebuilder->tree_handler->unref_node(
treebuilder->tree_handler->ctx,
@@ -196,12 +191,10 @@
treebuilder->context.mode = IN_TABLE_BODY;
} else if (type == TABLE) {
- hubbub_error e;
/** \todo parse error */
/* This should match "</table>" handling */
- e = element_stack_pop_until(treebuilder, TABLE);
- assert(e == HUBBUB_OK);
+ element_stack_pop_until(treebuilder, TABLE);
reset_insertion_mode(treebuilder);
@@ -222,11 +215,9 @@
&token->data.tag.name);
if (type == TABLE) {
- hubbub_error e;
/** \todo fragment case */
- e = element_stack_pop_until(treebuilder, TABLE);
- assert(e == HUBBUB_OK);
+ element_stack_pop_until(treebuilder, TABLE);
reset_insertion_mode(treebuilder);
} else if (type == BODY || type == CAPTION || type == COL ||
Modified: trunk/hubbub/src/treebuilder/in_table_body.c
URL: http://source.netsurf-browser.org/trunk/hubbub/src/treebuilder/in_table_b...
==============================================================================
--- trunk/hubbub/src/treebuilder/in_table_body.c (original)
+++ trunk/hubbub/src/treebuilder/in_table_body.c Tue Jul 26 16:20:28 2011
@@ -25,13 +25,11 @@
while (cur_node != TBODY && cur_node != TFOOT &&
cur_node != THEAD && cur_node != HTML) {
- hubbub_error e;
hubbub_ns ns;
element_type type;
void *node;
- e = element_stack_pop(treebuilder, &ns, &type, &node);
- assert(e == HUBBUB_OK);
+ element_stack_pop(treebuilder, &ns, &type, &node);
treebuilder->tree_handler->unref_node(
treebuilder->tree_handler->ctx,
@@ -55,7 +53,6 @@
if (element_in_scope(treebuilder, TBODY, true) ||
element_in_scope(treebuilder, THEAD, true) ||
element_in_scope(treebuilder, TFOOT, true)) {
- hubbub_error e;
hubbub_ns ns;
element_type otype;
void *node;
@@ -65,8 +62,7 @@
/* "Act as if an end tag with the same name as the current
* node had been seen" -- this behaviour should be identical
* to handling for (tbody/tfoot/thead) end tags in this mode */
- e = element_stack_pop(treebuilder, &ns, &otype, &node);
- assert(e == HUBBUB_OK);
+ element_stack_pop(treebuilder, &ns, &otype, &node);
treebuilder->tree_handler->unref_node(
treebuilder->tree_handler->ctx,
@@ -148,16 +144,14 @@
/** \todo parse error */
/* Ignore the token */
} else {
- hubbub_error e;
hubbub_ns ns;
element_type otype;
void *node;
table_clear_stack(treebuilder);
- e = element_stack_pop(treebuilder, &ns,
+ element_stack_pop(treebuilder, &ns,
&otype, &node);
- assert(e == HUBBUB_OK);
treebuilder->tree_handler->unref_node(
treebuilder->tree_handler->ctx,
Modified: trunk/hubbub/src/treebuilder/treebuilder.c
URL: http://source.netsurf-browser.org/trunk/hubbub/src/treebuilder/treebuilde...
==============================================================================
--- trunk/hubbub/src/treebuilder/treebuilder.c (original)
+++ trunk/hubbub/src/treebuilder/treebuilder.c Tue Jul 26 16:20:28 2011
@@ -618,10 +618,7 @@
error = element_stack_push(treebuilder, entry->details.ns,
entry->details.type, appended);
if (error != HUBBUB_OK) {
- hubbub_error err;
-
- err = remove_node_from_dom(treebuilder, appended);
- assert(err == HUBBUB_OK);
+ remove_node_from_dom(treebuilder, appended);
treebuilder->tree_handler->unref_node(
treebuilder->tree_handler->ctx,
@@ -668,13 +665,10 @@
hubbub_ns ns;
element_type type;
void *node;
- hubbub_error err;
-
- err = element_stack_pop(treebuilder, &ns, &type, &node);
- assert(err == HUBBUB_OK);
-
- err = remove_node_from_dom(treebuilder, node);
- assert(err == HUBBUB_OK);
+
+ element_stack_pop(treebuilder, &ns, &type, &node);
+
+ remove_node_from_dom(treebuilder, node);
treebuilder->tree_handler->unref_node(
treebuilder->tree_handler->ctx,
@@ -737,15 +731,12 @@
element_type type;
void *node;
uint32_t stack_index;
- hubbub_error error;
if (is_scoping_element(entry->details.type))
done = true;
- error = formatting_list_remove(treebuilder, entry,
+ formatting_list_remove(treebuilder, entry,
&ns, &type, &node, &stack_index);
- /* Can't fail. Ensure this. */
- assert(error == HUBBUB_OK);
treebuilder->tree_handler->unref_node(
treebuilder->tree_handler->ctx,
@@ -806,10 +797,7 @@
treebuilder->context.form_element,
appended);
if (error != HUBBUB_OK) {
- hubbub_error err;
-
- err = remove_node_from_dom(treebuilder, appended);
- assert(err == HUBBUB_OK);
+ remove_node_from_dom(treebuilder, appended);
treebuilder->tree_handler->unref_node(
treebuilder->tree_handler->ctx,
@@ -823,10 +811,7 @@
error = element_stack_push(treebuilder,
tag->ns, type, appended);
if (error != HUBBUB_OK) {
- hubbub_error err;
-
- err = remove_node_from_dom(treebuilder, appended);
- assert(err == HUBBUB_OK);
+ remove_node_from_dom(treebuilder, appended);
treebuilder->tree_handler->unref_node(
treebuilder->tree_handler->ctx,
@@ -859,7 +844,6 @@
while (type == DD || type == DT || type == LI || type == OPTION ||
type == OPTGROUP || type == P || type == RP ||
type == RT) {
- hubbub_error error;
hubbub_ns ns;
element_type otype;
void *node;
@@ -867,8 +851,7 @@
if (except != UNKNOWN && type == except)
break;
- error = element_stack_pop(treebuilder, &ns, &otype, &node);
- assert(error == HUBBUB_OK);
+ element_stack_pop(treebuilder, &ns, &otype, &node);
treebuilder->tree_handler->unref_node(
treebuilder->tree_handler->ctx,
@@ -1174,12 +1157,9 @@
element_type otype = UNKNOWN;
void *node;
hubbub_ns ns;
- hubbub_error error;
while (otype != type) {
- error = element_stack_pop(treebuilder, &ns, &otype, &node);
- /* No error can occur here. Ensure this. */
- assert(error == HUBBUB_OK);
+ element_stack_pop(treebuilder, &ns, &otype, &node);
treebuilder->tree_handler->unref_node(
treebuilder->tree_handler->ctx, node);
11 years, 7 months
- 1
- 0
r12627 jmb - in /trunk/libcss/src: lex/ parse/properties/ select/properties/
by netsurf＠semichrome.net
Author: jmb
Date: Tue Jul 26 16:20:11 2011
New Revision: 12627
URL: http://source.netsurf-browser.org?rev=12627&view=rev
Log:
Fix build with GCC 4.6
Added:
trunk/libcss/src/select/properties/speech_rate.c (contents, props changed)
- copied, changed from r12624, trunk/libcss/src/select/properties/speach_rate.c
Removed:
trunk/libcss/src/select/properties/speach_rate.c
Modified:
trunk/libcss/src/lex/lex.c
trunk/libcss/src/parse/properties/font.c
trunk/libcss/src/select/properties/Makefile
trunk/libcss/src/select/properties/azimuth.c
trunk/libcss/src/select/properties/elevation.c
trunk/libcss/src/select/properties/page_break_inside.c
trunk/libcss/src/select/properties/pitch.c
trunk/libcss/src/select/properties/play_during.c
trunk/libcss/src/select/properties/speak.c
trunk/libcss/src/select/properties/speak_header.c
trunk/libcss/src/select/properties/speak_numeral.c
trunk/libcss/src/select/properties/speak_punctuation.c
trunk/libcss/src/select/properties/volume.c
Modified: trunk/libcss/src/lex/lex.c
URL: http://source.netsurf-browser.org/trunk/libcss/src/lex/lex.c?rev=12627&r1...
==============================================================================
--- trunk/libcss/src/lex/lex.c (original)
+++ trunk/libcss/src/lex/lex.c Tue Jul 26 16:20:11 2011
@@ -378,7 +378,11 @@
error = parserutils_inputstream_peek(lexer->input, 0,
&data, &clen);
+#ifndef NDEBUG
assert(type == CSS_TOKEN_EOF || error == PARSERUTILS_OK);
+#else
+ (void) error;
+#endif
t->data.data = (type == CSS_TOKEN_EOF) ? NULL : (uint8_t *) data;
}
Modified: trunk/libcss/src/parse/properties/font.c
URL: http://source.netsurf-browser.org/trunk/libcss/src/parse/properties/font....
==============================================================================
--- trunk/libcss/src/parse/properties/font.c (original)
+++ trunk/libcss/src/parse/properties/font.c Tue Jul 26 16:20:11 2011
@@ -195,9 +195,7 @@
bool style = true;
bool variant = true;
bool weight = true;
- bool size = true;
bool line_height = true;
- bool family = true;
css_style *style_style;
css_style *variant_style;
css_style *weight_style;
@@ -350,7 +348,6 @@
error = css__parse_font_size(c, vector, ctx, size_style);
if (error != CSS_OK)
goto css__parse_font_cleanup;
- size = false;
consumeWhitespace(vector, ctx);
@@ -388,12 +385,6 @@
error = css__parse_font_family(c, vector, ctx, family_style);
if (error != CSS_OK)
goto css__parse_font_cleanup;
- family = false;
-
- /* Must have size and family */
- assert(size != true);
- assert(family != true);
-
/* defaults */
if (style) {
Modified: trunk/libcss/src/select/properties/Makefile
URL: http://source.netsurf-browser.org/trunk/libcss/src/select/properties/Make...
==============================================================================
--- trunk/libcss/src/select/properties/Makefile (original)
+++ trunk/libcss/src/select/properties/Makefile Tue Jul 26 16:20:11 2011
@@ -78,7 +78,7 @@
quotes.c \
richness.c \
right.c \
-speach_rate.c \
+speech_rate.c \
speak.c \
speak_header.c \
speak_numeral.c \
Modified: trunk/libcss/src/select/properties/azimuth.c
URL: http://source.netsurf-browser.org/trunk/libcss/src/select/properties/azim...
==============================================================================
--- trunk/libcss/src/select/properties/azimuth.c (original)
+++ trunk/libcss/src/select/properties/azimuth.c Tue Jul 26 16:20:11 2011
@@ -15,15 +15,12 @@
css_error css__cascade_azimuth(uint32_t opv, css_style *style,
css_select_state *state)
{
- uint16_t value = 0;
css_fixed val = 0;
uint32_t unit = UNIT_DEG;
if (isInherit(opv) == false) {
switch (getValue(opv) & ~AZIMUTH_BEHIND) {
case AZIMUTH_ANGLE:
- value = 0;
-
val = *((css_fixed *) style->bytecode);
advance_bytecode(style, sizeof(val));
unit = *((uint32_t *) style->bytecode);
Modified: trunk/libcss/src/select/properties/elevation.c
URL: http://source.netsurf-browser.org/trunk/libcss/src/select/properties/elev...
==============================================================================
--- trunk/libcss/src/select/properties/elevation.c (original)
+++ trunk/libcss/src/select/properties/elevation.c Tue Jul 26 16:20:11 2011
@@ -17,15 +17,12 @@
css_error css__cascade_elevation(uint32_t opv, css_style *style,
css_select_state *state)
{
- uint16_t value = 0;
css_fixed val = 0;
uint32_t unit = UNIT_DEG;
if (isInherit(opv) == false) {
switch (getValue(opv)) {
case ELEVATION_ANGLE:
- value = 0;
-
val = *((css_fixed *) style->bytecode);
advance_bytecode(style, sizeof(val));
Modified: trunk/libcss/src/select/properties/page_break_inside.c
URL: http://source.netsurf-browser.org/trunk/libcss/src/select/properties/page...
==============================================================================
--- trunk/libcss/src/select/properties/page_break_inside.c (original)
+++ trunk/libcss/src/select/properties/page_break_inside.c Tue Jul 26 16:20:11 2011
@@ -17,8 +17,6 @@
css_error css__cascade_page_break_inside(uint32_t opv, css_style *style,
css_select_state *state)
{
- uint16_t value = 0;
-
UNUSED(style);
if (isInherit(opv) == false) {
@@ -26,7 +24,6 @@
case PAGE_BREAK_INSIDE_AUTO:
case PAGE_BREAK_INSIDE_AVOID:
/** \todo convert to public values */
- value = 0;
break;
}
}
Modified: trunk/libcss/src/select/properties/pitch.c
URL: http://source.netsurf-browser.org/trunk/libcss/src/select/properties/pitc...
==============================================================================
--- trunk/libcss/src/select/properties/pitch.c (original)
+++ trunk/libcss/src/select/properties/pitch.c Tue Jul 26 16:20:11 2011
@@ -17,15 +17,12 @@
css_error css__cascade_pitch(uint32_t opv, css_style *style,
css_select_state *state)
{
- uint16_t value = 0;
css_fixed freq = 0;
uint32_t unit = UNIT_HZ;
if (isInherit(opv) == false) {
switch (getValue(opv)) {
case PITCH_FREQUENCY:
- value = 0;
-
freq = *((css_fixed *) style->bytecode);
advance_bytecode(style, sizeof(freq));
unit = *((uint32_t *) style->bytecode);
Modified: trunk/libcss/src/select/properties/play_during.c
URL: http://source.netsurf-browser.org/trunk/libcss/src/select/properties/play...
==============================================================================
--- trunk/libcss/src/select/properties/play_during.c (original)
+++ trunk/libcss/src/select/properties/play_during.c Tue Jul 26 16:20:11 2011
@@ -17,14 +17,11 @@
css_error css__cascade_play_during(uint32_t opv, css_style *style,
css_select_state *state)
{
- uint16_t value = 0;
lwc_string *uri = NULL;
if (isInherit(opv) == false) {
switch (getValue(opv)) {
case PLAY_DURING_URI:
- value = 0;
-
css__stylesheet_string_get(style->sheet, *((css_code_t *) style->bytecode), &uri);
advance_bytecode(style, sizeof(css_code_t));
break;
Removed: trunk/libcss/src/select/properties/speach_rate.c
URL: http://source.netsurf-browser.org/trunk/libcss/src/select/properties/spea...
==============================================================================
--- trunk/libcss/src/select/properties/speach_rate.c (original)
+++ trunk/libcss/src/select/properties/speach_rate.c (removed)
@@ -1,77 +1,0 @@
-/*
- * This file is part of LibCSS
- * Licensed under the MIT License,
- * http://www.opensource.org/licenses/mit-license.php
- * Copyright 2009 John-Mark Bell <jmb(a)netsurf-browser.org>
- */
-
-#include "bytecode/bytecode.h"
-#include "bytecode/opcodes.h"
-#include "select/propset.h"
-#include "select/propget.h"
-#include "utils/utils.h"
-
-#include "select/properties/properties.h"
-#include "select/properties/helpers.h"
-
-css_error css__cascade_speech_rate(uint32_t opv, css_style *style,
- css_select_state *state)
-{
- uint16_t value = 0;
- css_fixed rate = 0;
-
- if (isInherit(opv) == false) {
- switch (getValue(opv)) {
- case SPEECH_RATE_SET:
- value = 0;
-
- rate = *((css_fixed *) style->bytecode);
- advance_bytecode(style, sizeof(rate));
- break;
- case SPEECH_RATE_X_SLOW:
- case SPEECH_RATE_SLOW:
- case SPEECH_RATE_MEDIUM:
- case SPEECH_RATE_FAST:
- case SPEECH_RATE_X_FAST:
- case SPEECH_RATE_FASTER:
- case SPEECH_RATE_SLOWER:
- /** \todo convert to public values */
- break;
- }
- }
-
- if (css__outranks_existing(getOpcode(opv), isImportant(opv), state,
- isInherit(opv))) {
- /** \todo speech-rate */
- }
-
- return CSS_OK;
-}
-
-css_error css__set_speech_rate_from_hint(const css_hint *hint,
- css_computed_style *style)
-{
- UNUSED(hint);
- UNUSED(style);
-
- return CSS_OK;
-}
-
-css_error css__initial_speech_rate(css_select_state *state)
-{
- UNUSED(state);
-
- return CSS_OK;
-}
-
-css_error css__compose_speech_rate(const css_computed_style *parent,
- const css_computed_style *child,
- css_computed_style *result)
-{
- UNUSED(parent);
- UNUSED(child);
- UNUSED(result);
-
- return CSS_OK;
-}
-
Modified: trunk/libcss/src/select/properties/speak.c
URL: http://source.netsurf-browser.org/trunk/libcss/src/select/properties/spea...
==============================================================================
--- trunk/libcss/src/select/properties/speak.c (original)
+++ trunk/libcss/src/select/properties/speak.c Tue Jul 26 16:20:11 2011
@@ -17,8 +17,6 @@
css_error css__cascade_speak(uint32_t opv, css_style *style,
css_select_state *state)
{
- uint16_t value = 0;
-
UNUSED(style);
if (isInherit(opv) == false) {
@@ -27,7 +25,6 @@
case SPEAK_NONE:
case SPEAK_SPELL_OUT:
/** \todo convert to public values */
- value = 0;
break;
}
}
Modified: trunk/libcss/src/select/properties/speak_header.c
URL: http://source.netsurf-browser.org/trunk/libcss/src/select/properties/spea...
==============================================================================
--- trunk/libcss/src/select/properties/speak_header.c (original)
+++ trunk/libcss/src/select/properties/speak_header.c Tue Jul 26 16:20:11 2011
@@ -17,8 +17,6 @@
css_error css__cascade_speak_header(uint32_t opv, css_style *style,
css_select_state *state)
{
- uint16_t value = 0;
-
UNUSED(style);
if (isInherit(opv) == false) {
@@ -26,7 +24,6 @@
case SPEAK_HEADER_ONCE:
case SPEAK_HEADER_ALWAYS:
/** \todo convert to public values */
- value = 0;
break;
}
}
Modified: trunk/libcss/src/select/properties/speak_numeral.c
URL: http://source.netsurf-browser.org/trunk/libcss/src/select/properties/spea...
==============================================================================
--- trunk/libcss/src/select/properties/speak_numeral.c (original)
+++ trunk/libcss/src/select/properties/speak_numeral.c Tue Jul 26 16:20:11 2011
@@ -17,8 +17,6 @@
css_error css__cascade_speak_numeral(uint32_t opv, css_style *style,
css_select_state *state)
{
- uint16_t value = 0;
-
UNUSED(style);
if (isInherit(opv) == false) {
@@ -26,7 +24,6 @@
case SPEAK_NUMERAL_DIGITS:
case SPEAK_NUMERAL_CONTINUOUS:
/** \todo convert to public values */
- value = 0;
break;
}
}
Modified: trunk/libcss/src/select/properties/speak_punctuation.c
URL: http://source.netsurf-browser.org/trunk/libcss/src/select/properties/spea...
==============================================================================
--- trunk/libcss/src/select/properties/speak_punctuation.c (original)
+++ trunk/libcss/src/select/properties/speak_punctuation.c Tue Jul 26 16:20:11 2011
@@ -17,8 +17,6 @@
css_error css__cascade_speak_punctuation(
uint32_t opv, css_style *style, css_select_state *state)
{
- uint16_t value = 0;
-
UNUSED(style);
if (isInherit(opv) == false) {
@@ -26,7 +24,6 @@
case SPEAK_PUNCTUATION_CODE:
case SPEAK_PUNCTUATION_NONE:
/** \todo convert to public values */
- value = 0;
break;
}
}
Copied: trunk/libcss/src/select/properties/speech_rate.c (from r12624, trunk/libcss/src/select/properties/speach_rate.c)
URL: http://source.netsurf-browser.org/trunk/libcss/src/select/properties/spee...
==============================================================================
--- trunk/libcss/src/select/properties/speach_rate.c (original)
+++ trunk/libcss/src/select/properties/speech_rate.c Tue Jul 26 16:20:11 2011
@@ -17,14 +17,11 @@
css_error css__cascade_speech_rate(uint32_t opv, css_style *style,
css_select_state *state)
{
- uint16_t value = 0;
css_fixed rate = 0;
if (isInherit(opv) == false) {
switch (getValue(opv)) {
case SPEECH_RATE_SET:
- value = 0;
-
rate = *((css_fixed *) style->bytecode);
advance_bytecode(style, sizeof(rate));
break;
Propchange: trunk/libcss/src/select/properties/speech_rate.c
------------------------------------------------------------------------------
svn:mergeinfo =
Modified: trunk/libcss/src/select/properties/volume.c
URL: http://source.netsurf-browser.org/trunk/libcss/src/select/properties/volu...
==============================================================================
--- trunk/libcss/src/select/properties/volume.c (original)
+++ trunk/libcss/src/select/properties/volume.c Tue Jul 26 16:20:11 2011
@@ -17,21 +17,16 @@
css_error css__cascade_volume(uint32_t opv, css_style *style,
css_select_state *state)
{
- uint16_t value = 0;
css_fixed val = 0;
uint32_t unit = UNIT_PCT;
if (isInherit(opv) == false) {
switch (getValue(opv)) {
case VOLUME_NUMBER:
- value = 0;
-
val = *((css_fixed *) style->bytecode);
advance_bytecode(style, sizeof(val));
break;
case VOLUME_DIMENSION:
- value = 0;
-
val = *((css_fixed *) style->bytecode);
advance_bytecode(style, sizeof(val));
unit = *((uint32_t *) style->bytecode);
11 years, 7 months
- 1
- 0
r12626 tlsa - in /trunk/netsurf: desktop/search.c desktop/selection.c desktop/selection.h render/html.c render/html_internal.h render/textplain.c render/textplain.h
by netsurf＠semichrome.net
Author: tlsa
Date: Tue Jul 26 08:53:42 2011
New Revision: 12626
URL: http://source.netsurf-browser.org?rev=12626&view=rev
Log:
Selection is now subordinate to html and text content types, and disassociated from browser windows. Note: search currently uses hlcache_handle_get_content() to go from bw to h to get at c for search highlighting via selection.
Modified:
trunk/netsurf/desktop/search.c
trunk/netsurf/desktop/selection.c
trunk/netsurf/desktop/selection.h
trunk/netsurf/render/html.c
trunk/netsurf/render/html_internal.h
trunk/netsurf/render/textplain.c
trunk/netsurf/render/textplain.h
Modified: trunk/netsurf/desktop/search.c
URL: http://source.netsurf-browser.org/trunk/netsurf/desktop/search.c?rev=1262...
==============================================================================
--- trunk/netsurf/desktop/search.c (original)
+++ trunk/netsurf/desktop/search.c Tue Jul 26 08:53:42 2011
@@ -81,7 +81,7 @@
struct box *cur, bool case_sens,
struct search_context *context);
static bool find_occurrences_text(const char *pattern, int p_len,
- hlcache_handle *c, bool case_sens,
+ struct content *c, bool case_sens,
struct search_context *context);
static struct list_entry *add_entry(unsigned start_idx, unsigned end_idx,
struct search_context *context);
@@ -236,7 +236,7 @@
struct search_context *context, search_flags_t flags)
{
struct rect bounds;
- hlcache_handle *c;
+ hlcache_handle *h;
struct box *box = NULL;
bool case_sensitive, forwards, showall;
@@ -247,15 +247,15 @@
if (context->bw == NULL)
return;
- c = context->bw->current_content;
+ h = context->bw->current_content;
/* only handle html contents */
- if ((!c) || (content_get_type(c) != CONTENT_HTML &&
- content_get_type(c) != CONTENT_TEXTPLAIN))
+ if ((!h) || (content_get_type(h) != CONTENT_HTML &&
+ content_get_type(h) != CONTENT_TEXTPLAIN))
return;
- if (content_get_type(c) == CONTENT_HTML) {
- box = html_get_box_tree(c);
+ if (content_get_type(h) == CONTENT_HTML) {
+ box = html_get_box_tree(h);
if (!box)
return;
@@ -284,13 +284,14 @@
(context->callbacks->hourglass != NULL))
context->callbacks->hourglass(true, context->p);
- if (content_get_type(c) == CONTENT_HTML)
+ if (content_get_type(h) == CONTENT_HTML)
res = find_occurrences_html(string, string_len,
box, case_sensitive, context);
else {
- assert(content_get_type(c) == CONTENT_TEXTPLAIN);
+ assert(content_get_type(h) == CONTENT_TEXTPLAIN);
res = find_occurrences_text(string, string_len,
- c, case_sensitive, context);
+ hlcache_handle_get_content(h),
+ case_sensitive, context);
}
if (!res) {
@@ -343,7 +344,7 @@
if (context->current == NULL)
return;
- switch (content_get_type(c)) {
+ switch (content_get_type(h)) {
case CONTENT_HTML:
/* get box position and jump to it */
box_coords(context->current->start_box,
@@ -357,8 +358,9 @@
break;
default:
- assert(content_get_type(c) == CONTENT_TEXTPLAIN);
- textplain_coords_from_range(c,
+ assert(content_get_type(h) == CONTENT_TEXTPLAIN);
+ textplain_coords_from_range(
+ hlcache_handle_get_content(h),
context->current->start_idx,
context->current->end_idx, &bounds);
break;
@@ -551,7 +553,7 @@
*/
bool find_occurrences_text(const char *pattern, int p_len,
- hlcache_handle *c, bool case_sens,
+ struct content *c, bool case_sens,
struct search_context *context)
{
int nlines = textplain_line_count(c);
@@ -640,25 +642,30 @@
}
}
if (add && !a->sel) {
- a->sel = selection_create();
- selection_set_browser_window(a->sel, context->bw);
- if (a->sel) {
- hlcache_handle *c = context->bw->
- current_content;
- switch (content_get_type(c)) {
- case CONTENT_HTML:
- selection_init(a->sel,
- html_get_box_tree(c));
- break;
- default:
- assert(content_get_type(c) ==
- CONTENT_TEXTPLAIN);
- selection_init(a->sel, NULL);
- break;
- }
- selection_set_start(a->sel, a->start_idx);
- selection_set_end(a->sel, a->end_idx);
+ hlcache_handle *h = context->bw->current_content;
+ struct content *c = hlcache_handle_get_content(h);
+
+ switch (content_get_type(h)) {
+ case CONTENT_HTML:
+ a->sel = selection_create(c, true);
+ if (!a->sel)
+ continue;
+
+ selection_init(a->sel, html_get_box_tree(h));
+ break;
+ default:
+ assert(content_get_type(h) ==
+ CONTENT_TEXTPLAIN);
+ a->sel = selection_create(c, false);
+ if (!a->sel)
+ continue;
+
+ selection_init(a->sel, NULL);
+ break;
}
+
+ selection_set_start(a->sel, a->start_idx);
+ selection_set_end(a->sel, a->end_idx);
}
}
}
Modified: trunk/netsurf/desktop/selection.c
URL: http://source.netsurf-browser.org/trunk/netsurf/desktop/selection.c?rev=1...
==============================================================================
--- trunk/netsurf/desktop/selection.c (original)
+++ trunk/netsurf/desktop/selection.c Tue Jul 26 08:53:42 2011
@@ -27,7 +27,6 @@
#include <stdbool.h>
#include <string.h>
-#include "content/hlcache.h"
#include "desktop/gui.h"
#include "desktop/mouse.h"
#include "desktop/plotters.h"
@@ -36,6 +35,7 @@
#include "render/box.h"
#include "render/font.h"
#include "render/form.h"
+#include "render/html_internal.h"
#include "render/textplain.h"
#include "utils/log.h"
#include "utils/utf8.h"
@@ -87,52 +87,56 @@
bool do_marker);
static struct box *get_box(struct box *b, unsigned offset, size_t *pidx);
+
+/**
+ * Get the browser window containing the content a selection object belongs to.
+ *
+ * \param s selection object
+ * \return the browser window
+ */
+static struct browser_window * selection_get_browser_window(struct selection *s)
+{
+ if (s->is_html)
+ return html_get_browser_window(s->c);
+ else
+ return textplain_get_browser_window(s->c);
+}
+
+
/**
* Creates a new selection object associated with a browser window.
*
* \return new selection context
*/
-struct selection *selection_create(void)
+struct selection *selection_create(struct content *c, bool is_html)
{
struct selection *s = calloc(1, sizeof(struct selection));
if (s) {
- selection_prepare(s);
- }
+ selection_prepare(s, c, is_html);
+ }
+
return s;
}
/**
* Prepare a newly created selection object for use.
*
- * \param s selection object
- * \param bw browser window
- */
-
-void selection_prepare(struct selection *s)
+ * \param s selection object
+ * \param c content
+ * \param is_html true if content is html false if content is textplain
+ */
+
+void selection_prepare(struct selection *s, struct content *c, bool is_html)
{
if (s) {
- s->bw = NULL;
+ s->c = c;
+ s->is_html = is_html;
s->root = NULL;
s->drag_state = DRAG_NONE;
s->max_idx = 0;
selection_clear(s, false);
}
-}
-
-/**
- * Set the browser window that contains the selection within a selection
- * object.
- *
- * \param bw browser window
- */
-
-void selection_set_browser_window(struct selection *s,
- struct browser_window *bw)
-{
- assert(s);
-
- s->bw = bw;
}
@@ -188,11 +192,9 @@
s->root = root;
if (root) {
s->max_idx = selection_label_subtree(root, root_idx);
- }
- else {
- hlcache_handle *c = s->bw->current_content;
- if (c && content_get_type(c) == CONTENT_TEXTPLAIN)
- s->max_idx = textplain_size(c);
+ } else {
+ if (s->is_html == false)
+ s->max_idx = textplain_size(s->c);
else
s->max_idx = 0;
}
@@ -291,10 +293,12 @@
browser_mouse_state modkeys =
(mouse & (BROWSER_MOUSE_MOD_1 | BROWSER_MOUSE_MOD_2));
int pos = -1; /* 0 = inside selection, 1 = after it */
- struct browser_window *top;
-
- if (s->bw == NULL)
+ struct browser_window *top = selection_get_browser_window(s);
+
+ if (top == NULL)
return false; /* not our problem */
+
+ top = browser_window_get_root(top);
if (!SAME_SPACE(s, idx))
return false; /* not our problem */
@@ -307,8 +311,6 @@
pos = 1;
}
}
-
- top = browser_window_get_root(s->bw);
if (!pos &&
((mouse & BROWSER_MOUSE_DRAG_1) ||
@@ -612,7 +614,6 @@
bool selection_traverse(struct selection *s, seln_traverse_handler handler,
void *handle)
{
- hlcache_handle *c;
save_text_whitespace before = WHITESPACE_NONE;
bool first = true;
const char *text;
@@ -629,10 +630,7 @@
}
/* Text */
- c = s->bw->current_content;
- if (!c) return true;
-
- text = textplain_get_raw_data(c, s->start_idx, s->end_idx, &length);
+ text = textplain_get_raw_data(s->c, s->start_idx, s->end_idx, &length);
if (text && !handler(text, length, NULL, handle, NULL, 0))
return false;
@@ -717,17 +715,15 @@
return;
}
else {
- hlcache_handle *c = s->bw->current_content;
- if (c && content_get_type(c) == CONTENT_TEXTPLAIN &&
- end_idx > start_idx) {
- textplain_coords_from_range(c, start_idx,
+ if (s->is_html == false && end_idx > start_idx) {
+ textplain_coords_from_range(s->c, start_idx,
end_idx, &rdw.r);
rdw.inited = true;
}
}
if (rdw.inited)
- browser_window_redraw_rect(s->bw, rdw.r.x0, rdw.r.y0,
+ content__request_redraw(s->c, rdw.r.x0, rdw.r.y0,
rdw.r.x1 - rdw.r.x0, rdw.r.y1 - rdw.r.y0);
}
@@ -744,7 +740,7 @@
{
int old_start, old_end;
bool was_defined;
- struct browser_window *top;
+ struct browser_window *top = selection_get_browser_window(s);
assert(s);
was_defined = selection_defined(s);
@@ -755,10 +751,10 @@
s->start_idx = 0;
s->end_idx = 0;
- if (!s->bw)
+ if (!top)
return;
- top = browser_window_get_root(s->bw);
+ top = browser_window_get_root(top);
gui_clear_selection(top->window);
@@ -1015,13 +1011,10 @@
bool selection_save_text(struct selection *s, const char *path)
{
- hlcache_handle *c = s->bw->current_content;
struct save_text_state sv = { NULL, 0, 0 };
utf8_convert_ret ret;
char *result;
FILE *out;
-
- assert(c);
if (!selection_traverse(s, save_handler, &sv)) {
free(sv.block);
Modified: trunk/netsurf/desktop/selection.h
URL: http://source.netsurf-browser.org/trunk/netsurf/desktop/selection.h?rev=1...
==============================================================================
--- trunk/netsurf/desktop/selection.h (original)
+++ trunk/netsurf/desktop/selection.h Tue Jul 26 08:53:42 2011
@@ -40,7 +40,7 @@
struct selection
{
- struct browser_window *bw;
+ struct content *c;
struct box *root;
unsigned max_idx; /* total bytes in text representation */
@@ -49,6 +49,7 @@
unsigned end_idx;
bool defined;
+ bool is_html;
seln_drag_state drag_state;
};
@@ -59,15 +60,12 @@
size_t whitespace_length);
-struct selection *selection_create(void);
-void selection_prepare(struct selection *s);
+struct selection *selection_create(struct content *c, bool is_html);
+void selection_prepare(struct selection *s, struct content *c, bool is_html);
void selection_destroy(struct selection *s);
void selection_init(struct selection *s, struct box *root);
void selection_reinit(struct selection *s, struct box *root);
-
-void selection_set_browser_window(struct selection *s,
- struct browser_window *bw);
/* struct box *selection_root(struct selection *s); */
#define selection_root(s) ((s)->root)
Modified: trunk/netsurf/render/html.c
URL: http://source.netsurf-browser.org/trunk/netsurf/render/html.c?rev=12626&r...
==============================================================================
--- trunk/netsurf/render/html.c (original)
+++ trunk/netsurf/render/html.c Tue Jul 26 08:53:42 2011
@@ -258,7 +258,7 @@
c->font_func = &nsfont;
c->scrollbar = NULL;
- selection_prepare(&c->sel);
+ selection_prepare(&c->sel, (struct content *)c, true);
nerror = http_parameter_list_find_item(params, html_charset, &charset);
if (nerror == NSERROR_OK) {
@@ -2040,7 +2040,6 @@
/* text selection */
selection_init(&html->sel, html->layout);
- selection_set_browser_window(&html->sel, bw);
for (object = html->object_list; object != NULL; object = next) {
next = object->next;
@@ -2067,8 +2066,6 @@
{
html_content *html = (html_content *) c;
struct content_html_object *object, *next;
-
- selection_set_browser_window(&html->sel, NULL);
html->bw = NULL;
@@ -2367,3 +2364,19 @@
return CONTENT_HTML;
}
+/**
+ * Get the browser window containing an HTML content
+ *
+ * \param c HTML content
+ * \return the browser window
+ */
+struct browser_window *html_get_browser_window(struct content *c)
+{
+ html_content *html = (html_content *) c;
+
+ assert(c != NULL);
+ assert(c->handler == &html_content_handler);
+
+ return html->bw;
+}
+
Modified: trunk/netsurf/render/html_internal.h
URL: http://source.netsurf-browser.org/trunk/netsurf/render/html_internal.h?re...
==============================================================================
--- trunk/netsurf/render/html_internal.h (original)
+++ trunk/netsurf/render/html_internal.h Tue Jul 26 08:53:42 2011
@@ -111,6 +111,8 @@
void html__redraw_a_box(struct content *c, struct box *box);
+struct browser_window *html_get_browser_window(struct content *c);
+
/* in render/html_redraw.c */
bool html_redraw(struct content *c, struct content_redraw_data *data,
const struct rect *clip, const struct redraw_context *ctx);
Modified: trunk/netsurf/render/textplain.c
URL: http://source.netsurf-browser.org/trunk/netsurf/render/textplain.c?rev=12...
==============================================================================
--- trunk/netsurf/render/textplain.c (original)
+++ trunk/netsurf/render/textplain.c Tue Jul 26 08:53:42 2011
@@ -292,7 +292,7 @@
c->formatted_width = 0;
c->bw = NULL;
- selection_prepare(&c->sel);
+ selection_prepare(&c->sel, (struct content *)c, false);
return NSERROR_OK;
@@ -623,7 +623,6 @@
browser_mouse_state mouse, int x, int y)
{
textplain_content *text = (textplain_content *) c;
- hlcache_handle *h = bw->current_content;
if (bw->drag_type == DRAGGING_SELECTION && !mouse) {
int dir = -1;
@@ -632,7 +631,7 @@
if (selection_dragging_start(&text->sel))
dir = 1;
- idx = textplain_offset_from_coords(h, x, y, dir);
+ idx = textplain_offset_from_coords(c, x, y, dir);
selection_track(&text->sel, mouse, idx);
browser_window_set_drag_type(bw, DRAGGING_NONE);
@@ -641,13 +640,12 @@
switch (bw->drag_type) {
case DRAGGING_SELECTION: {
- hlcache_handle *h = bw->current_content;
int dir = -1;
size_t idx;
if (selection_dragging_start(&text->sel)) dir = 1;
- idx = textplain_offset_from_coords(h, x, y, dir);
+ idx = textplain_offset_from_coords(c, x, y, dir);
selection_track(&text->sel, mouse, idx);
}
break;
@@ -673,7 +671,6 @@
browser_mouse_state mouse, int x, int y)
{
textplain_content *text = (textplain_content *) c;
- hlcache_handle *h = bw->current_content;
gui_pointer_shape pointer = GUI_POINTER_DEFAULT;
const char *status = 0;
size_t idx;
@@ -681,7 +678,7 @@
browser_window_set_drag_type(bw, DRAGGING_NONE);
- idx = textplain_offset_from_coords(h, x, y, dir);
+ idx = textplain_offset_from_coords(c, x, y, dir);
if (selection_click(&text->sel, mouse, idx)) {
if (selection_dragging(&text->sel)) {
@@ -689,14 +686,14 @@
status = messages_get("Selecting");
}
else
- status = content_get_status_message(h);
+ status = content__get_status_message(c);
}
else {
if (bw->loading_content)
status = content_get_status_message(
bw->loading_content);
else
- status = content_get_status_message(h);
+ status = content__get_status_message(c);
if (mouse & (BROWSER_MOUSE_DRAG_1 | BROWSER_MOUSE_DRAG_2)) {
browser_window_page_drag_start(bw, x, y);
@@ -867,7 +864,6 @@
text->bw = bw;
/* text selection */
- selection_set_browser_window(&text->sel, bw);
selection_init(&text->sel, NULL);
}
@@ -879,8 +875,6 @@
void textplain_close(struct content *c)
{
textplain_content *text = (textplain_content *) c;
-
- selection_set_browser_window(&text->sel, NULL);
text->bw = NULL;
}
@@ -903,14 +897,13 @@
* \param h Content to retrieve line count from
* \return Number of lines
*/
-unsigned long textplain_line_count(hlcache_handle *h)
-{
- textplain_content *c =
- (textplain_content *) hlcache_handle_get_content(h);
+unsigned long textplain_line_count(struct content *c)
+{
+ textplain_content *text = (textplain_content *) c;
assert(c != NULL);
- return c->physical_line_count;
+ return text->physical_line_count;
}
/**
@@ -919,14 +912,13 @@
* \param h Content to retrieve size of
* \return Size, in bytes, of data
*/
-size_t textplain_size(hlcache_handle *h)
-{
- textplain_content *c =
- (textplain_content *) hlcache_handle_get_content(h);
+size_t textplain_size(struct content *c)
+{
+ textplain_content *text = (textplain_content *) c;
assert(c != NULL);
- return c->utf8_data_size;
+ return text->utf8_data_size;
}
/**
@@ -942,10 +934,9 @@
* \return byte offset of character containing (or nearest to) point
*/
-size_t textplain_offset_from_coords(hlcache_handle *h, int x, int y, int dir)
-{
- textplain_content *c =
- (textplain_content *) hlcache_handle_get_content(h);
+size_t textplain_offset_from_coords(struct content *c, int x, int y, int dir)
+{
+ textplain_content *textc = (textplain_content *) c;
float line_height = textplain_line_height();
struct textplain_line *line;
const char *text;
@@ -958,7 +949,7 @@
y = (int)((float)(y - MARGIN) / line_height);
x -= MARGIN;
- nlines = c->physical_line_count;
+ nlines = textc->physical_line_count;
if (!nlines)
return 0;
@@ -966,8 +957,8 @@
else if ((unsigned)y >= nlines)
y = nlines - 1;
- line = &c->physical_line[y];
- text = c->utf8_data + line->start;
+ line = &textc->physical_line[y];
+ text = textc->utf8_data + line->start;
length = line->length;
idx = 0;
@@ -1016,25 +1007,24 @@
* Given a byte offset within the text, return the line number
* of the line containing that offset (or -1 if offset invalid)
*
- * \param h content of type CONTENT_TEXTPLAIN
+ * \param c content of type CONTENT_TEXTPLAIN
* \param offset byte offset within textual representation
* \return line number, or -1 if offset invalid (larger than size)
*/
-int textplain_find_line(hlcache_handle *h, unsigned offset)
-{
- textplain_content *c =
- (textplain_content *) hlcache_handle_get_content(h);
+int textplain_find_line(struct content *c, unsigned offset)
+{
+ textplain_content *text = (textplain_content *) c;
struct textplain_line *line;
int nlines;
int lineno = 0;
assert(c != NULL);
- line = c->physical_line;
- nlines = c->physical_line_count;
-
- if (offset > c->utf8_data_size)
+ line = text->physical_line;
+ nlines = text->physical_line_count;
+
+ if (offset > text->utf8_data_size)
return -1;
/* \todo - implement binary search here */
@@ -1097,11 +1087,10 @@
* \param r rectangle to be completed
*/
-void textplain_coords_from_range(hlcache_handle *h, unsigned start,
+void textplain_coords_from_range(struct content *c, unsigned start,
unsigned end, struct rect *r)
{
- textplain_content *c =
- (textplain_content *) hlcache_handle_get_content(h);
+ textplain_content *text = (textplain_content *) c;
float line_height = textplain_line_height();
char *utf8_data;
struct textplain_line *line;
@@ -1110,14 +1099,14 @@
assert(c != NULL);
assert(start <= end);
- assert(end <= c->utf8_data_size);
-
- utf8_data = c->utf8_data;
- nlines = c->physical_line_count;
- line = c->physical_line;
+ assert(end <= text->utf8_data_size);
+
+ utf8_data = text->utf8_data;
+ nlines = text->physical_line_count;
+ line = text->physical_line;
/* find start */
- lineno = textplain_find_line(h, start);
+ lineno = textplain_find_line(c, start);
r->y0 = (int)(MARGIN + lineno * line_height);
@@ -1126,10 +1115,10 @@
forwards most of the time */
/* find end */
- lineno = textplain_find_line(h, end);
+ lineno = textplain_find_line(c, end);
r->x0 = 0;
- r->x1 = c->formatted_width;
+ r->x1 = text->formatted_width;
}
else {
/* single line */
@@ -1156,22 +1145,21 @@
* \return pointer to text, or NULL if invalid line number
*/
-char *textplain_get_line(hlcache_handle *h, unsigned lineno,
+char *textplain_get_line(struct content *c, unsigned lineno,
size_t *poffset, size_t *plen)
{
- textplain_content *c =
- (textplain_content *) hlcache_handle_get_content(h);
+ textplain_content *text = (textplain_content *) c;
struct textplain_line *line;
assert(c != NULL);
- if (lineno >= c->physical_line_count)
+ if (lineno >= text->physical_line_count)
return NULL;
- line = &c->physical_line[lineno];
+ line = &text->physical_line[lineno];
*poffset = line->start;
*plen = line->length;
- return c->utf8_data + line->start;
+ return text->utf8_data + line->start;
}
@@ -1187,16 +1175,15 @@
* \return pointer to text, or NULL if no text
*/
-char *textplain_get_raw_data(hlcache_handle *h, unsigned start, unsigned end,
+char *textplain_get_raw_data(struct content *c, unsigned start, unsigned end,
size_t *plen)
{
- textplain_content *c =
- (textplain_content *) hlcache_handle_get_content(h);
+ textplain_content *text = (textplain_content *) c;
size_t utf8_size;
assert(c != NULL);
- utf8_size = c->utf8_data_size;
+ utf8_size = text->utf8_data_size;
/* any text at all? */
if (!utf8_size) return NULL;
@@ -1207,7 +1194,7 @@
*plen = end - start;
- return c->utf8_data + start;
+ return text->utf8_data + start;
}
/**
@@ -1224,3 +1211,19 @@
INTTOFIX((textplain_style.size / FONT_SIZE_SCALE))))), F_72));
}
+/**
+ * Get the browser window containing a textplain content
+ *
+ * \param c text/plain content
+ * \return the browser window
+ */
+struct browser_window *textplain_get_browser_window(struct content *c)
+{
+ textplain_content *text = (textplain_content *) c;
+
+ assert(c != NULL);
+ assert(c->handler == &textplain_content_handler);
+
+ return text->bw;
+}
+
Modified: trunk/netsurf/render/textplain.h
URL: http://source.netsurf-browser.org/trunk/netsurf/render/textplain.h?rev=12...
==============================================================================
--- trunk/netsurf/render/textplain.h (original)
+++ trunk/netsurf/render/textplain.h Tue Jul 26 08:53:42 2011
@@ -36,17 +36,17 @@
void textplain_fini(void);
/* access to lines for text selection and searching */
-unsigned long textplain_line_count(struct hlcache_handle *h);
-size_t textplain_size(struct hlcache_handle *h);
+unsigned long textplain_line_count(struct content *c);
+size_t textplain_size(struct content *c);
-size_t textplain_offset_from_coords(struct hlcache_handle *h, int x, int y,
- int dir);
-void textplain_coords_from_range(struct hlcache_handle *h,
+size_t textplain_offset_from_coords(struct content *c, int x, int y, int dir);
+void textplain_coords_from_range(struct content *c,
unsigned start, unsigned end, struct rect *r);
-char *textplain_get_line(struct hlcache_handle *h, unsigned lineno,
+char *textplain_get_line(struct content *c, unsigned lineno,
size_t *poffset, size_t *plen);
-int textplain_find_line(struct hlcache_handle *h, unsigned offset);
-char *textplain_get_raw_data(struct hlcache_handle *h,
+int textplain_find_line(struct content *c, unsigned offset);
+char *textplain_get_raw_data(struct content *c,
unsigned start, unsigned end, size_t *plen);
+struct browser_window *textplain_get_browser_window(struct content *c);
#endif
11 years, 7 months
- 1
- 0
r12625 tlsa - /trunk/netsurf/desktop/search.c
by netsurf＠semichrome.net
Author: tlsa
Date: Tue Jul 26 05:52:26 2011
New Revision: 12625
URL: http://source.netsurf-browser.org?rev=12625&view=rev
Log:
Remove unused hlcache_handle from search context.
Modified:
trunk/netsurf/desktop/search.c
Modified: trunk/netsurf/desktop/search.c
URL: http://source.netsurf-browser.org/trunk/netsurf/desktop/search.c?rev=1262...
==============================================================================
--- trunk/netsurf/desktop/search.c (original)
+++ trunk/netsurf/desktop/search.c Tue Jul 26 05:52:26 2011
@@ -62,7 +62,6 @@
struct search_context {
struct browser_window *bw;
- hlcache_handle *content;
char *string;
bool prev_case_sens;
bool newsearch;
@@ -128,7 +127,6 @@
context->found = search_head;
context->current = NULL;
- context->content = NULL;
context->string = NULL;
context->prev_case_sens = false;
context->newsearch = true;
@@ -307,8 +305,7 @@
if ((context->callbacks != NULL) &&
(context->callbacks->hourglass != NULL))
context->callbacks->hourglass(false, context->p);
-
- context->content = c;
+
context->prev_case_sens = case_sensitive;
/* LOG(("%d %p %p (%p, %p)", new, search_data.found->next, search_data.current,
search_data.current->prev, search_data.current->next)); */
11 years, 7 months
- 1
- 0
r12624 jmb - /trunk/netsurf/utils/url.c
by netsurf＠semichrome.net
Author: jmb
Date: Sun Jul 24 07:11:11 2011
New Revision: 12624
URL: http://source.netsurf-browser.org?rev=12624&view=rev
Log:
Skip over credentials when lower casing host
Modified:
trunk/netsurf/utils/url.c
Modified: trunk/netsurf/utils/url.c
URL: http://source.netsurf-browser.org/trunk/netsurf/utils/url.c?rev=12624&r1=...
==============================================================================
--- trunk/netsurf/utils/url.c (original)
+++ trunk/netsurf/utils/url.c Sun Jul 24 07:11:11 2011
@@ -288,9 +288,21 @@
/* make host lower-case */
if (match[URL_RE_AUTHORITY].rm_so != -1) {
+ /* Find @ delimiting credentials from host, if any */
for (i = match[URL_RE_AUTHORITY].rm_so;
- (regoff_t) i != match[URL_RE_AUTHORITY].rm_eo;
+ (regoff_t) i != match[URL_RE_AUTHORITY].rm_eo;
i++) {
+ if (norm[i] == '@') {
+ i++;
+ break;
+ }
+ }
+
+ /* No credentials; transform entire host */
+ if ((regoff_t) i == match[URL_RE_AUTHORITY].rm_eo)
+ i = match[URL_RE_AUTHORITY].rm_so;
+
+ for (; (regoff_t) i != match[URL_RE_AUTHORITY].rm_eo; i++) {
if (norm[i] == ':' && (i + 3) < len) {
if (http && norm[i + 1] == '8' &&
norm[i + 2] == '0' &&
11 years, 8 months
- 1
- 0