netsurf: branch master updated. release/3.2-11-ge23e8b5
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/e23e8b5112e24d9c2998e...
...commit http://git.netsurf-browser.org/netsurf.git/commit/e23e8b5112e24d9c2998e71...
...tree http://git.netsurf-browser.org/netsurf.git/tree/e23e8b5112e24d9c2998e71f9...
The branch, master has been updated
via e23e8b5112e24d9c2998e71f96f5ec2c1dc0971e (commit)
via 181cdfab0611f04e5ae37addfac617055c748802 (commit)
via b49832a9587b60533d025f73237ecdf51b3a576c (commit)
from f2ba35133be84e0ec24a2dc756a5719623674f1a (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=e23e8b5112e24d9c299...
commit e23e8b5112e24d9c2998e71f96f5ec2c1dc0971e
Author: Michael Drake <tlsa(a)netsurf-browser.org>
Commit: Michael Drake <tlsa(a)netsurf-browser.org>
Avoid forward declaration of box_contains_point.
diff --git a/render/box.c b/render/box.c
index 91f866d..e1d0848 100644
--- a/render/box.c
+++ b/render/box.c
@@ -42,7 +42,6 @@
#include "utils/talloc.h"
#include "utils/utils.h"
-static bool box_contains_point(struct box *box, int x, int y, bool *physically);
static bool box_nearer_text_box(struct box *box, int bx, int by,
int x, int y, int dir, struct box **nearest, int *tx, int *ty,
int *nr_xd, int *nr_yd);
@@ -343,6 +342,128 @@ void box_bounds(struct box *box, struct rect *r)
}
+/**
+ * Determine if a point lies within a box.
+ *
+ * \param box box to consider
+ * \param x coordinate relative to box
+ * \param y coordinate relative to box
+ * \param physically if function returning true, physically is set true if
+ * point is within the box's physical dimensions and false
+ * if the point is not within the box's physical dimensions
+ * but is in the area defined by the box's descendants.
+ * if function returning false, physically is undefined.
+ * \return true if the point is within the box or a descendant box
+ *
+ * This is a helper function for box_at_point().
+ */
+
+static bool box_contains_point(struct box *box, int x, int y, bool *physically)
+{
+ css_computed_clip_rect css_rect;
+
+ if (box->style != NULL &&
+ css_computed_position(box->style) ==
+ CSS_POSITION_ABSOLUTE &&
+ css_computed_clip(box->style, &css_rect) ==
+ CSS_CLIP_RECT) {
+ /* We have an absolutly positioned box with a clip rect */
+ struct rect r = {
+ .x0 = box->border[LEFT].width,
+ .y0 = box->border[TOP].width,
+ .x1 = box->padding[LEFT] + box->width +
+ box->border[RIGHT].width +
+ box->padding[RIGHT],
+ .y1 = box->padding[TOP] + box->height +
+ box->border[BOTTOM].width +
+ box->padding[BOTTOM]
+ };
+ if (x >= r.x0 && x < r.x1 && y >= r.y0 && y < r.y1)
+ *physically = true;
+ else
+ *physically = false;
+
+ /* Adjust rect to css clip region */
+ if (css_rect.left_auto == false) {
+ r.x0 += FIXTOINT(nscss_len2px(
+ css_rect.left, css_rect.lunit,
+ box->style));
+ }
+ if (css_rect.top_auto == false) {
+ r.y0 += FIXTOINT(nscss_len2px(
+ css_rect.top, css_rect.tunit,
+ box->style));
+ }
+ if (css_rect.right_auto == false) {
+ r.x1 = box->border[LEFT].width +
+ FIXTOINT(nscss_len2px(
+ css_rect.right,
+ css_rect.runit,
+ box->style));
+ }
+ if (css_rect.bottom_auto == false) {
+ r.y1 = box->border[TOP].width +
+ FIXTOINT(nscss_len2px(
+ css_rect.bottom,
+ css_rect.bunit,
+ box->style));
+ }
+
+ /* Test if point is in clipped box */
+ if (x >= r.x0 && x < r.x1 && y >= r.y0 && y < r.y1) {
+ /* inside clip area */
+ return true;
+ }
+
+ /* Not inside clip area */
+ return false;
+ }
+ if (x >= -box->border[LEFT].width &&
+ x < box->padding[LEFT] + box->width +
+ box->padding[RIGHT] + box->border[RIGHT].width &&
+ y >= -box->border[TOP].width &&
+ y < box->padding[TOP] + box->height +
+ box->padding[BOTTOM] + box->border[BOTTOM].width) {
+ *physically = true;
+ return true;
+ }
+ if (box->list_marker && box->list_marker->x - box->x <= x +
+ box->list_marker->border[LEFT].width &&
+ x < box->list_marker->x - box->x +
+ box->list_marker->padding[LEFT] +
+ box->list_marker->width +
+ box->list_marker->border[RIGHT].width +
+ box->list_marker->padding[RIGHT] &&
+ box->list_marker->y - box->y <= y +
+ box->list_marker->border[TOP].width &&
+ y < box->list_marker->y - box->y +
+ box->list_marker->padding[TOP] +
+ box->list_marker->height +
+ box->list_marker->border[BOTTOM].width +
+ box->list_marker->padding[BOTTOM]) {
+ *physically = true;
+ return true;
+ }
+ if ((box->style && css_computed_overflow_x(box->style) ==
+ CSS_OVERFLOW_VISIBLE) || !box->style) {
+ if (box->descendant_x0 <= x &&
+ x < box->descendant_x1) {
+ *physically = false;
+ return true;
+ }
+ }
+ if ((box->style && css_computed_overflow_y(box->style) ==
+ CSS_OVERFLOW_VISIBLE) || !box->style) {
+ if (box->descendant_y0 <= y &&
+ y < box->descendant_y1) {
+ *physically = false;
+ return true;
+ }
+ }
+ return false;
+}
+
+
/** Direction to move in a box-tree walk */
enum box_walk_dir {
BOX_WALK_CHILDREN,
@@ -581,128 +702,6 @@ struct box *box_at_point(struct box *box, const int x, const int y,
/**
- * Determine if a point lies within a box.
- *
- * \param box box to consider
- * \param x coordinate relative to box
- * \param y coordinate relative to box
- * \param physically if function returning true, physically is set true if
- * point is within the box's physical dimensions and false
- * if the point is not within the box's physical dimensions
- * but is in the area defined by the box's descendants.
- * if function returning false, physically is undefined.
- * \return true if the point is within the box or a descendant box
- *
- * This is a helper function for box_at_point().
- */
-
-bool box_contains_point(struct box *box, int x, int y, bool *physically)
-{
- css_computed_clip_rect css_rect;
-
- if (box->style != NULL &&
- css_computed_position(box->style) ==
- CSS_POSITION_ABSOLUTE &&
- css_computed_clip(box->style, &css_rect) ==
- CSS_CLIP_RECT) {
- /* We have an absolutly positioned box with a clip rect */
- struct rect r = {
- .x0 = box->border[LEFT].width,
- .y0 = box->border[TOP].width,
- .x1 = box->padding[LEFT] + box->width +
- box->border[RIGHT].width +
- box->padding[RIGHT],
- .y1 = box->padding[TOP] + box->height +
- box->border[BOTTOM].width +
- box->padding[BOTTOM]
- };
- if (x >= r.x0 && x < r.x1 && y >= r.y0 && y < r.y1)
- *physically = true;
- else
- *physically = false;
-
- /* Adjust rect to css clip region */
- if (css_rect.left_auto == false) {
- r.x0 += FIXTOINT(nscss_len2px(
- css_rect.left, css_rect.lunit,
- box->style));
- }
- if (css_rect.top_auto == false) {
- r.y0 += FIXTOINT(nscss_len2px(
- css_rect.top, css_rect.tunit,
- box->style));
- }
- if (css_rect.right_auto == false) {
- r.x1 = box->border[LEFT].width +
- FIXTOINT(nscss_len2px(
- css_rect.right,
- css_rect.runit,
- box->style));
- }
- if (css_rect.bottom_auto == false) {
- r.y1 = box->border[TOP].width +
- FIXTOINT(nscss_len2px(
- css_rect.bottom,
- css_rect.bunit,
- box->style));
- }
-
- /* Test if point is in clipped box */
- if (x >= r.x0 && x < r.x1 && y >= r.y0 && y < r.y1) {
- /* inside clip area */
- return true;
- }
-
- /* Not inside clip area */
- return false;
- }
- if (x >= -box->border[LEFT].width &&
- x < box->padding[LEFT] + box->width +
- box->padding[RIGHT] + box->border[RIGHT].width &&
- y >= -box->border[TOP].width &&
- y < box->padding[TOP] + box->height +
- box->padding[BOTTOM] + box->border[BOTTOM].width) {
- *physically = true;
- return true;
- }
- if (box->list_marker && box->list_marker->x - box->x <= x +
- box->list_marker->border[LEFT].width &&
- x < box->list_marker->x - box->x +
- box->list_marker->padding[LEFT] +
- box->list_marker->width +
- box->list_marker->border[RIGHT].width +
- box->list_marker->padding[RIGHT] &&
- box->list_marker->y - box->y <= y +
- box->list_marker->border[TOP].width &&
- y < box->list_marker->y - box->y +
- box->list_marker->padding[TOP] +
- box->list_marker->height +
- box->list_marker->border[BOTTOM].width +
- box->list_marker->padding[BOTTOM]) {
- *physically = true;
- return true;
- }
- if ((box->style && css_computed_overflow_x(box->style) ==
- CSS_OVERFLOW_VISIBLE) || !box->style) {
- if (box->descendant_x0 <= x &&
- x < box->descendant_x1) {
- *physically = false;
- return true;
- }
- }
- if ((box->style && css_computed_overflow_y(box->style) ==
- CSS_OVERFLOW_VISIBLE) || !box->style) {
- if (box->descendant_y0 <= y &&
- y < box->descendant_y1) {
- *physically = false;
- return true;
- }
- }
- return false;
-}
-
-
-/**
* Check whether box is nearer mouse coordinates than current nearest box
*
* \param box box to test
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=181cdfab0611f04e5ae...
commit 181cdfab0611f04e5ae37addfac617055c748802
Author: Michael Drake <tlsa(a)netsurf-browser.org>
Commit: Michael Drake <tlsa(a)netsurf-browser.org>
Make box_at_point use itteration, rather than recursion.
This should reduce stack usage. The walk logic is split out from
box_at_point so that it might be reused.
diff --git a/render/box.c b/render/box.c
index 501bae6..91f866d 100644
--- a/render/box.c
+++ b/render/box.c
@@ -343,6 +343,191 @@ void box_bounds(struct box *box, struct rect *r)
}
+/** Direction to move in a box-tree walk */
+enum box_walk_dir {
+ BOX_WALK_CHILDREN,
+ BOX_WALK_PARENT,
+ BOX_WALK_NEXT_SIBLING,
+ BOX_WALK_FLOAT_CHILDREN,
+ BOX_WALK_NEXT_FLOAT_SIBLING,
+ BOX_WALK_FLOAT_CONTAINER
+};
+
+
+/**
+ * Move from box to next box in given direction, adjusting for box coord change
+ *
+ * \param b box to move from from
+ * \param dir direction to move in
+ * \param x box's global x-coord, updated to position of next box
+ * \param y box's global y-coord, updated to position of next box
+ *
+ * If no box can be found in given direction, NULL is returned.
+ */
+static inline struct box *box_move_xy(struct box *b, enum box_walk_dir dir,
+ int *x, int *y)
+{
+ switch (dir) {
+ case BOX_WALK_CHILDREN:
+ b = b->children;
+ if (b == NULL)
+ return NULL;
+ *x += b->x;
+ *y += b->y;
+ if (!box_is_float(b)) {
+ return b;
+ }
+ /* Fall through */
+
+ case BOX_WALK_NEXT_SIBLING:
+ do {
+ *x -= b->x;
+ *y -= b->y;
+ b = b->next;
+ if (b == NULL)
+ break;
+ *x += b->x;
+ *y += b->y;
+ } while (box_is_float(b));
+ return b;
+
+ case BOX_WALK_PARENT:
+ *x -= b->x;
+ *y -= b->y;
+ return b->parent;
+
+ case BOX_WALK_FLOAT_CHILDREN:
+ b = b->float_children;
+ if (b == NULL)
+ return NULL;
+ *x += b->x;
+ *y += b->y;
+ return b;
+
+ case BOX_WALK_NEXT_FLOAT_SIBLING:
+ *x -= b->x;
+ *y -= b->y;
+ b = b->next_float;
+ if (b == NULL)
+ return NULL;
+ *x += b->x;
+ *y += b->y;
+ return b;
+
+ case BOX_WALK_FLOAT_CONTAINER:
+ *x -= b->x;
+ *y -= b->y;
+ return b->float_container;
+
+ default:
+ assert(0 && "Bad box walk type.");
+ }
+}
+
+
+/**
+ * Itterator for walking to next box in interaction order
+ *
+ * \param b box to find next box from
+ * \param x box's global x-coord, updated to position of next box
+ * \param y box's global y-coord, updated to position of next box
+ * \param skip_children whether to skip box's children
+ *
+ * This walks to a boxes float children before its children. When walking
+ * children, floating boxes are skipped.
+ */
+static inline struct box *box_next_xy(struct box *b, int *x, int *y,
+ bool skip_children)
+{
+ struct box *n;
+ int tx, ty;
+
+ assert(b != NULL);
+
+ if (skip_children) {
+ /* Caller is not interested in any kind of children */
+ goto skip_children;
+ }
+
+ tx = *x; ty = *y;
+ n = box_move_xy(b, BOX_WALK_FLOAT_CHILDREN, &tx, &ty);
+ if (n) {
+ /* Next node is float child */
+ *x = tx;
+ *y = ty;
+ return n;
+ }
+done_float_children:
+
+ tx = *x; ty = *y;
+ n = box_move_xy(b, BOX_WALK_CHILDREN, &tx, &ty);
+ if (n) {
+ /* Next node is child */
+ *x = tx;
+ *y = ty;
+ return n;
+ }
+
+skip_children:
+ tx = *x; ty = *y;
+ n = box_move_xy(b, BOX_WALK_NEXT_FLOAT_SIBLING, &tx, &ty);
+ if (n) {
+ /* Go to next float sibling */
+ *x = tx;
+ *y = ty;
+ return n;
+ }
+
+ if (box_is_float(b)) {
+ /* Done floats, but the float container may have children,
+ * or siblings, or ansestors with siblings. Change to
+ * float container and move past handling its float children.
+ */
+ b = box_move_xy(b, BOX_WALK_FLOAT_CONTAINER, x, y);
+ goto done_float_children;
+ }
+
+ /* Go to next sibling, or nearest ancestor with next sibling. */
+ while (b) {
+ while (!b->next && b->parent) {
+ b = box_move_xy(b, BOX_WALK_PARENT, x, y);
+ if (box_is_float(b)) {
+ /* Go on to next float, if there is one */
+ goto skip_children;
+ }
+ }
+ if (!b->next) {
+ /* No more boxes */
+ return NULL;
+ }
+
+ tx = *x; ty = *y;
+ n = box_move_xy(b, BOX_WALK_NEXT_SIBLING, &tx, &ty);
+ if (n) {
+ /* Go to non-float (ancestor) sibling */
+ *x = tx;
+ *y = ty;
+ return n;
+
+ } else if (b->parent) {
+ b = box_move_xy(b, BOX_WALK_PARENT, x, y);
+ if (box_is_float(b)) {
+ /* Go on to next float, if there is one */
+ goto skip_children;
+ }
+
+ } else {
+ /* No more boxes */
+ return NULL;
+ }
+ }
+
+ assert(b != NULL);
+ return NULL;
+}
+
+
+
/**
* Find the boxes at a point.
*
@@ -370,115 +555,28 @@ void box_bounds(struct box *box, struct rect *r)
struct box *box_at_point(struct box *box, const int x, const int y,
int *box_x, int *box_y)
{
- int bx = *box_x, by = *box_y;
- struct box *child, *sibling;
+ bool skip_children;
bool physically;
assert(box);
- /* consider floats first, since they will often overlap other boxes */
- for (child = box->float_children; child; child = child->next_float) {
- if (box_contains_point(child, x - bx, y - by, &physically)) {
- *box_x = bx + child->x -
- scrollbar_get_offset(child->scroll_x);
- *box_y = by + child->y -
- scrollbar_get_offset(child->scroll_y);
-
- if (physically)
- return child;
- else
- return box_at_point(child, x, y, box_x, box_y);
- }
- }
-
-non_float_children:
- /* non-float children */
- for (child = box->children; child; child = child->next) {
- if (box_is_float(child))
- continue;
- if (box_contains_point(child, x - bx, y - by, &physically)) {
- *box_x = bx + child->x -
- scrollbar_get_offset(child->scroll_x);
- *box_y = by + child->y -
- scrollbar_get_offset(child->scroll_y);
-
- if (physically)
- return child;
- else
- return box_at_point(child, x, y, box_x, box_y);
- }
- }
-
- /* marker boxes */
- if (box->list_marker) {
- if (box_contains_point(box->list_marker, x - bx, y - by,
+ skip_children = false;
+ while ((box = box_next_xy(box, box_x, box_y, skip_children))) {
+ if (box_contains_point(box, x - *box_x, y - *box_y,
&physically)) {
- *box_x = bx + box->list_marker->x;
- *box_y = by + box->list_marker->y;
- return box->list_marker;
- }
- }
+ *box_x -= scrollbar_get_offset(box->scroll_x);
+ *box_y -= scrollbar_get_offset(box->scroll_y);
- /* siblings and siblings of ancestors */
- while (box) {
- if (box_is_float(box)) {
- bx -= box->x - scrollbar_get_offset(box->scroll_x);
- by -= box->y - scrollbar_get_offset(box->scroll_y);
- for (sibling = box->next_float; sibling;
- sibling = sibling->next_float) {
- if (box_contains_point(sibling,
- x - bx, y - by, &physically)) {
- *box_x = bx + sibling->x -
- scrollbar_get_offset(
- sibling->scroll_x);
- *box_y = by + sibling->y -
- scrollbar_get_offset(
- sibling->scroll_y);
-
- if (physically)
- return sibling;
- else
- return box_at_point(sibling,
- x, y,
- box_x, box_y);
- }
- }
- /* ascend to float's parent */
- do {
- box = box->parent;
- } while (!box->float_children);
- /* process non-float children of float's parent */
- goto non_float_children;
+ if (physically)
+ return box;
+ skip_children = false;
} else {
- bx -= box->x - scrollbar_get_offset(box->scroll_x);
- by -= box->y - scrollbar_get_offset(box->scroll_y);
- for (sibling = box->next; sibling;
- sibling = sibling->next) {
- if (box_is_float(sibling))
- continue;
- if (box_contains_point(sibling, x - bx, y - by,
- &physically)) {
- *box_x = bx + sibling->x -
- scrollbar_get_offset(
- sibling->scroll_x);
- *box_y = by + sibling->y -
- scrollbar_get_offset(
- sibling->scroll_y);
-
- if (physically)
- return sibling;
- else
- return box_at_point(sibling,
- x, y,
- box_x, box_y);
- }
- }
- box = box->parent;
+ skip_children = true;
}
}
- return 0;
+ return NULL;
}
@@ -486,8 +584,8 @@ non_float_children:
* Determine if a point lies within a box.
*
* \param box box to consider
- * \param x coordinate relative to box parent
- * \param y coordinate relative to box parent
+ * \param x coordinate relative to box
+ * \param y coordinate relative to box
* \param physically if function returning true, physically is set true if
* point is within the box's physical dimensions and false
* if the point is not within the box's physical dimensions
@@ -509,12 +607,12 @@ bool box_contains_point(struct box *box, int x, int y, bool *physically)
CSS_CLIP_RECT) {
/* We have an absolutly positioned box with a clip rect */
struct rect r = {
- .x0 = box->x - box->border[LEFT].width,
- .y0 = box->y - box->border[TOP].width,
- .x1 = box->x + box->padding[LEFT] + box->width +
+ .x0 = box->border[LEFT].width,
+ .y0 = box->border[TOP].width,
+ .x1 = box->padding[LEFT] + box->width +
box->border[RIGHT].width +
box->padding[RIGHT],
- .y1 = box->y + box->padding[TOP] + box->height +
+ .y1 = box->padding[TOP] + box->height +
box->border[BOTTOM].width +
box->padding[BOTTOM]
};
@@ -535,14 +633,14 @@ bool box_contains_point(struct box *box, int x, int y, bool *physically)
box->style));
}
if (css_rect.right_auto == false) {
- r.x1 = box->x - box->border[LEFT].width +
+ r.x1 = box->border[LEFT].width +
FIXTOINT(nscss_len2px(
css_rect.right,
css_rect.runit,
box->style));
}
if (css_rect.bottom_auto == false) {
- r.y1 = box->y - box->border[TOP].width +
+ r.y1 = box->border[TOP].width +
FIXTOINT(nscss_len2px(
css_rect.bottom,
css_rect.bunit,
@@ -558,25 +656,25 @@ bool box_contains_point(struct box *box, int x, int y, bool *physically)
/* Not inside clip area */
return false;
}
- if (box->x <= x + box->border[LEFT].width &&
- x < box->x + box->padding[LEFT] + box->width +
- box->border[RIGHT].width + box->padding[RIGHT] &&
- box->y <= y + box->border[TOP].width &&
- y < box->y + box->padding[TOP] + box->height +
- box->border[BOTTOM].width + box->padding[BOTTOM]) {
+ if (x >= -box->border[LEFT].width &&
+ x < box->padding[LEFT] + box->width +
+ box->padding[RIGHT] + box->border[RIGHT].width &&
+ y >= -box->border[TOP].width &&
+ y < box->padding[TOP] + box->height +
+ box->padding[BOTTOM] + box->border[BOTTOM].width) {
*physically = true;
return true;
}
- if (box->list_marker && box->list_marker->x <= x +
+ if (box->list_marker && box->list_marker->x - box->x <= x +
box->list_marker->border[LEFT].width &&
- x < box->list_marker->x +
+ x < box->list_marker->x - box->x +
box->list_marker->padding[LEFT] +
box->list_marker->width +
box->list_marker->border[RIGHT].width +
box->list_marker->padding[RIGHT] &&
- box->list_marker->y <= y +
+ box->list_marker->y - box->y <= y +
box->list_marker->border[TOP].width &&
- y < box->list_marker->y +
+ y < box->list_marker->y - box->y +
box->list_marker->padding[TOP] +
box->list_marker->height +
box->list_marker->border[BOTTOM].width +
@@ -586,16 +684,16 @@ bool box_contains_point(struct box *box, int x, int y, bool *physically)
}
if ((box->style && css_computed_overflow_x(box->style) ==
CSS_OVERFLOW_VISIBLE) || !box->style) {
- if (box->x + box->descendant_x0 <= x &&
- x < box->x + box->descendant_x1) {
+ if (box->descendant_x0 <= x &&
+ x < box->descendant_x1) {
*physically = false;
return true;
}
}
if ((box->style && css_computed_overflow_y(box->style) ==
CSS_OVERFLOW_VISIBLE) || !box->style) {
- if (box->y + box->descendant_y0 <= y &&
- y < box->y + box->descendant_y1) {
+ if (box->descendant_y0 <= y &&
+ y < box->descendant_y1) {
*physically = false;
return true;
}
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=b49832a9587b60533d0...
commit b49832a9587b60533d025f73237ecdf51b3a576c
Author: Michael Drake <tlsa(a)netsurf-browser.org>
Commit: Michael Drake <tlsa(a)netsurf-browser.org>
Add float_container to box tree dump.
diff --git a/render/box.c b/render/box.c
index dd7c31f..501bae6 100644
--- a/render/box.c
+++ b/render/box.c
@@ -951,6 +951,8 @@ void box_dump(FILE *stream, struct box *box, unsigned int depth, bool style)
fprintf(stream, " float_children %p", box->float_children);
if (box->next_float)
fprintf(stream, " next_float %p", box->next_float);
+ if (box->float_container)
+ fprintf(stream, " float_container %p", box->float_container);
if (box->col) {
fprintf(stream, " (columns");
for (i = 0; i != box->columns; i++)
-----------------------------------------------------------------------
Summary of changes:
render/box.c | 425 ++++++++++++++++++++++++++++++++++++----------------------
1 files changed, 262 insertions(+), 163 deletions(-)
diff --git a/render/box.c b/render/box.c
index dd7c31f..e1d0848 100644
--- a/render/box.c
+++ b/render/box.c
@@ -42,7 +42,6 @@
#include "utils/talloc.h"
#include "utils/utils.h"
-static bool box_contains_point(struct box *box, int x, int y, bool *physically);
static bool box_nearer_text_box(struct box *box, int bx, int by,
int x, int y, int dir, struct box **nearest, int *tx, int *ty,
int *nr_xd, int *nr_yd);
@@ -344,150 +343,11 @@ void box_bounds(struct box *box, struct rect *r)
/**
- * Find the boxes at a point.
- *
- * \param box box to search children of
- * \param x point to find, in global document coordinates
- * \param y point to find, in global document coordinates
- * \param box_x position of box, in global document coordinates, updated
- * to position of returned box, if any
- * \param box_y position of box, in global document coordinates, updated
- * to position of returned box, if any
- * \return box at given point, or 0 if none found
- *
- * To find all the boxes in the hierarchy at a certain point, use code like
- * this:
- * \code
- * struct box *box = top_of_document_to_search;
- * int box_x = 0, box_y = 0;
- *
- * while ((box = box_at_point(box, x, y, &box_x, &box_y))) {
- * // process box
- * }
- * \endcode
- */
-
-struct box *box_at_point(struct box *box, const int x, const int y,
- int *box_x, int *box_y)
-{
- int bx = *box_x, by = *box_y;
- struct box *child, *sibling;
- bool physically;
-
- assert(box);
-
- /* consider floats first, since they will often overlap other boxes */
- for (child = box->float_children; child; child = child->next_float) {
- if (box_contains_point(child, x - bx, y - by, &physically)) {
- *box_x = bx + child->x -
- scrollbar_get_offset(child->scroll_x);
- *box_y = by + child->y -
- scrollbar_get_offset(child->scroll_y);
-
- if (physically)
- return child;
- else
- return box_at_point(child, x, y, box_x, box_y);
- }
- }
-
-non_float_children:
- /* non-float children */
- for (child = box->children; child; child = child->next) {
- if (box_is_float(child))
- continue;
- if (box_contains_point(child, x - bx, y - by, &physically)) {
- *box_x = bx + child->x -
- scrollbar_get_offset(child->scroll_x);
- *box_y = by + child->y -
- scrollbar_get_offset(child->scroll_y);
-
- if (physically)
- return child;
- else
- return box_at_point(child, x, y, box_x, box_y);
- }
- }
-
- /* marker boxes */
- if (box->list_marker) {
- if (box_contains_point(box->list_marker, x - bx, y - by,
- &physically)) {
- *box_x = bx + box->list_marker->x;
- *box_y = by + box->list_marker->y;
- return box->list_marker;
- }
- }
-
- /* siblings and siblings of ancestors */
- while (box) {
- if (box_is_float(box)) {
- bx -= box->x - scrollbar_get_offset(box->scroll_x);
- by -= box->y - scrollbar_get_offset(box->scroll_y);
- for (sibling = box->next_float; sibling;
- sibling = sibling->next_float) {
- if (box_contains_point(sibling,
- x - bx, y - by, &physically)) {
- *box_x = bx + sibling->x -
- scrollbar_get_offset(
- sibling->scroll_x);
- *box_y = by + sibling->y -
- scrollbar_get_offset(
- sibling->scroll_y);
-
- if (physically)
- return sibling;
- else
- return box_at_point(sibling,
- x, y,
- box_x, box_y);
- }
- }
- /* ascend to float's parent */
- do {
- box = box->parent;
- } while (!box->float_children);
- /* process non-float children of float's parent */
- goto non_float_children;
-
- } else {
- bx -= box->x - scrollbar_get_offset(box->scroll_x);
- by -= box->y - scrollbar_get_offset(box->scroll_y);
- for (sibling = box->next; sibling;
- sibling = sibling->next) {
- if (box_is_float(sibling))
- continue;
- if (box_contains_point(sibling, x - bx, y - by,
- &physically)) {
- *box_x = bx + sibling->x -
- scrollbar_get_offset(
- sibling->scroll_x);
- *box_y = by + sibling->y -
- scrollbar_get_offset(
- sibling->scroll_y);
-
- if (physically)
- return sibling;
- else
- return box_at_point(sibling,
- x, y,
- box_x, box_y);
- }
- }
- box = box->parent;
- }
- }
-
- return 0;
-}
-
-
-/**
* Determine if a point lies within a box.
*
* \param box box to consider
- * \param x coordinate relative to box parent
- * \param y coordinate relative to box parent
+ * \param x coordinate relative to box
+ * \param y coordinate relative to box
* \param physically if function returning true, physically is set true if
* point is within the box's physical dimensions and false
* if the point is not within the box's physical dimensions
@@ -498,7 +358,7 @@ non_float_children:
* This is a helper function for box_at_point().
*/
-bool box_contains_point(struct box *box, int x, int y, bool *physically)
+static bool box_contains_point(struct box *box, int x, int y, bool *physically)
{
css_computed_clip_rect css_rect;
@@ -509,12 +369,12 @@ bool box_contains_point(struct box *box, int x, int y, bool *physically)
CSS_CLIP_RECT) {
/* We have an absolutly positioned box with a clip rect */
struct rect r = {
- .x0 = box->x - box->border[LEFT].width,
- .y0 = box->y - box->border[TOP].width,
- .x1 = box->x + box->padding[LEFT] + box->width +
+ .x0 = box->border[LEFT].width,
+ .y0 = box->border[TOP].width,
+ .x1 = box->padding[LEFT] + box->width +
box->border[RIGHT].width +
box->padding[RIGHT],
- .y1 = box->y + box->padding[TOP] + box->height +
+ .y1 = box->padding[TOP] + box->height +
box->border[BOTTOM].width +
box->padding[BOTTOM]
};
@@ -535,14 +395,14 @@ bool box_contains_point(struct box *box, int x, int y, bool *physically)
box->style));
}
if (css_rect.right_auto == false) {
- r.x1 = box->x - box->border[LEFT].width +
+ r.x1 = box->border[LEFT].width +
FIXTOINT(nscss_len2px(
css_rect.right,
css_rect.runit,
box->style));
}
if (css_rect.bottom_auto == false) {
- r.y1 = box->y - box->border[TOP].width +
+ r.y1 = box->border[TOP].width +
FIXTOINT(nscss_len2px(
css_rect.bottom,
css_rect.bunit,
@@ -558,25 +418,25 @@ bool box_contains_point(struct box *box, int x, int y, bool *physically)
/* Not inside clip area */
return false;
}
- if (box->x <= x + box->border[LEFT].width &&
- x < box->x + box->padding[LEFT] + box->width +
- box->border[RIGHT].width + box->padding[RIGHT] &&
- box->y <= y + box->border[TOP].width &&
- y < box->y + box->padding[TOP] + box->height +
- box->border[BOTTOM].width + box->padding[BOTTOM]) {
+ if (x >= -box->border[LEFT].width &&
+ x < box->padding[LEFT] + box->width +
+ box->padding[RIGHT] + box->border[RIGHT].width &&
+ y >= -box->border[TOP].width &&
+ y < box->padding[TOP] + box->height +
+ box->padding[BOTTOM] + box->border[BOTTOM].width) {
*physically = true;
return true;
}
- if (box->list_marker && box->list_marker->x <= x +
+ if (box->list_marker && box->list_marker->x - box->x <= x +
box->list_marker->border[LEFT].width &&
- x < box->list_marker->x +
+ x < box->list_marker->x - box->x +
box->list_marker->padding[LEFT] +
box->list_marker->width +
box->list_marker->border[RIGHT].width +
box->list_marker->padding[RIGHT] &&
- box->list_marker->y <= y +
+ box->list_marker->y - box->y <= y +
box->list_marker->border[TOP].width &&
- y < box->list_marker->y +
+ y < box->list_marker->y - box->y +
box->list_marker->padding[TOP] +
box->list_marker->height +
box->list_marker->border[BOTTOM].width +
@@ -586,16 +446,16 @@ bool box_contains_point(struct box *box, int x, int y, bool *physically)
}
if ((box->style && css_computed_overflow_x(box->style) ==
CSS_OVERFLOW_VISIBLE) || !box->style) {
- if (box->x + box->descendant_x0 <= x &&
- x < box->x + box->descendant_x1) {
+ if (box->descendant_x0 <= x &&
+ x < box->descendant_x1) {
*physically = false;
return true;
}
}
if ((box->style && css_computed_overflow_y(box->style) ==
CSS_OVERFLOW_VISIBLE) || !box->style) {
- if (box->y + box->descendant_y0 <= y &&
- y < box->y + box->descendant_y1) {
+ if (box->descendant_y0 <= y &&
+ y < box->descendant_y1) {
*physically = false;
return true;
}
@@ -604,6 +464,243 @@ bool box_contains_point(struct box *box, int x, int y, bool *physically)
}
+/** Direction to move in a box-tree walk */
+enum box_walk_dir {
+ BOX_WALK_CHILDREN,
+ BOX_WALK_PARENT,
+ BOX_WALK_NEXT_SIBLING,
+ BOX_WALK_FLOAT_CHILDREN,
+ BOX_WALK_NEXT_FLOAT_SIBLING,
+ BOX_WALK_FLOAT_CONTAINER
+};
+
+
+/**
+ * Move from box to next box in given direction, adjusting for box coord change
+ *
+ * \param b box to move from from
+ * \param dir direction to move in
+ * \param x box's global x-coord, updated to position of next box
+ * \param y box's global y-coord, updated to position of next box
+ *
+ * If no box can be found in given direction, NULL is returned.
+ */
+static inline struct box *box_move_xy(struct box *b, enum box_walk_dir dir,
+ int *x, int *y)
+{
+ switch (dir) {
+ case BOX_WALK_CHILDREN:
+ b = b->children;
+ if (b == NULL)
+ return NULL;
+ *x += b->x;
+ *y += b->y;
+ if (!box_is_float(b)) {
+ return b;
+ }
+ /* Fall through */
+
+ case BOX_WALK_NEXT_SIBLING:
+ do {
+ *x -= b->x;
+ *y -= b->y;
+ b = b->next;
+ if (b == NULL)
+ break;
+ *x += b->x;
+ *y += b->y;
+ } while (box_is_float(b));
+ return b;
+
+ case BOX_WALK_PARENT:
+ *x -= b->x;
+ *y -= b->y;
+ return b->parent;
+
+ case BOX_WALK_FLOAT_CHILDREN:
+ b = b->float_children;
+ if (b == NULL)
+ return NULL;
+ *x += b->x;
+ *y += b->y;
+ return b;
+
+ case BOX_WALK_NEXT_FLOAT_SIBLING:
+ *x -= b->x;
+ *y -= b->y;
+ b = b->next_float;
+ if (b == NULL)
+ return NULL;
+ *x += b->x;
+ *y += b->y;
+ return b;
+
+ case BOX_WALK_FLOAT_CONTAINER:
+ *x -= b->x;
+ *y -= b->y;
+ return b->float_container;
+
+ default:
+ assert(0 && "Bad box walk type.");
+ }
+}
+
+
+/**
+ * Itterator for walking to next box in interaction order
+ *
+ * \param b box to find next box from
+ * \param x box's global x-coord, updated to position of next box
+ * \param y box's global y-coord, updated to position of next box
+ * \param skip_children whether to skip box's children
+ *
+ * This walks to a boxes float children before its children. When walking
+ * children, floating boxes are skipped.
+ */
+static inline struct box *box_next_xy(struct box *b, int *x, int *y,
+ bool skip_children)
+{
+ struct box *n;
+ int tx, ty;
+
+ assert(b != NULL);
+
+ if (skip_children) {
+ /* Caller is not interested in any kind of children */
+ goto skip_children;
+ }
+
+ tx = *x; ty = *y;
+ n = box_move_xy(b, BOX_WALK_FLOAT_CHILDREN, &tx, &ty);
+ if (n) {
+ /* Next node is float child */
+ *x = tx;
+ *y = ty;
+ return n;
+ }
+done_float_children:
+
+ tx = *x; ty = *y;
+ n = box_move_xy(b, BOX_WALK_CHILDREN, &tx, &ty);
+ if (n) {
+ /* Next node is child */
+ *x = tx;
+ *y = ty;
+ return n;
+ }
+
+skip_children:
+ tx = *x; ty = *y;
+ n = box_move_xy(b, BOX_WALK_NEXT_FLOAT_SIBLING, &tx, &ty);
+ if (n) {
+ /* Go to next float sibling */
+ *x = tx;
+ *y = ty;
+ return n;
+ }
+
+ if (box_is_float(b)) {
+ /* Done floats, but the float container may have children,
+ * or siblings, or ansestors with siblings. Change to
+ * float container and move past handling its float children.
+ */
+ b = box_move_xy(b, BOX_WALK_FLOAT_CONTAINER, x, y);
+ goto done_float_children;
+ }
+
+ /* Go to next sibling, or nearest ancestor with next sibling. */
+ while (b) {
+ while (!b->next && b->parent) {
+ b = box_move_xy(b, BOX_WALK_PARENT, x, y);
+ if (box_is_float(b)) {
+ /* Go on to next float, if there is one */
+ goto skip_children;
+ }
+ }
+ if (!b->next) {
+ /* No more boxes */
+ return NULL;
+ }
+
+ tx = *x; ty = *y;
+ n = box_move_xy(b, BOX_WALK_NEXT_SIBLING, &tx, &ty);
+ if (n) {
+ /* Go to non-float (ancestor) sibling */
+ *x = tx;
+ *y = ty;
+ return n;
+
+ } else if (b->parent) {
+ b = box_move_xy(b, BOX_WALK_PARENT, x, y);
+ if (box_is_float(b)) {
+ /* Go on to next float, if there is one */
+ goto skip_children;
+ }
+
+ } else {
+ /* No more boxes */
+ return NULL;
+ }
+ }
+
+ assert(b != NULL);
+ return NULL;
+}
+
+
+
+/**
+ * Find the boxes at a point.
+ *
+ * \param box box to search children of
+ * \param x point to find, in global document coordinates
+ * \param y point to find, in global document coordinates
+ * \param box_x position of box, in global document coordinates, updated
+ * to position of returned box, if any
+ * \param box_y position of box, in global document coordinates, updated
+ * to position of returned box, if any
+ * \return box at given point, or 0 if none found
+ *
+ * To find all the boxes in the hierarchy at a certain point, use code like
+ * this:
+ * \code
+ * struct box *box = top_of_document_to_search;
+ * int box_x = 0, box_y = 0;
+ *
+ * while ((box = box_at_point(box, x, y, &box_x, &box_y))) {
+ * // process box
+ * }
+ * \endcode
+ */
+
+struct box *box_at_point(struct box *box, const int x, const int y,
+ int *box_x, int *box_y)
+{
+ bool skip_children;
+ bool physically;
+
+ assert(box);
+
+ skip_children = false;
+ while ((box = box_next_xy(box, box_x, box_y, skip_children))) {
+ if (box_contains_point(box, x - *box_x, y - *box_y,
+ &physically)) {
+ *box_x -= scrollbar_get_offset(box->scroll_x);
+ *box_y -= scrollbar_get_offset(box->scroll_y);
+
+ if (physically)
+ return box;
+
+ skip_children = false;
+ } else {
+ skip_children = true;
+ }
+ }
+
+ return NULL;
+}
+
+
/**
* Check whether box is nearer mouse coordinates than current nearest box
*
@@ -951,6 +1048,8 @@ void box_dump(FILE *stream, struct box *box, unsigned int depth, bool style)
fprintf(stream, " float_children %p", box->float_children);
if (box->next_float)
fprintf(stream, " next_float %p", box->next_float);
+ if (box->float_container)
+ fprintf(stream, " float_container %p", box->float_container);
if (box->col) {
fprintf(stream, " (columns");
for (i = 0; i != box->columns; i++)
--
NetSurf Browser
8 years, 6 months
- 1
- 0
netsurf-website: branch master updated. 330894bd3eefe5eccfcb3e3bcdd7edb1cc6a6259
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf-website.git/shortlog/330894bd3eefe...
...commit http://git.netsurf-browser.org/netsurf-website.git/commit/330894bd3eefe5e...
...tree http://git.netsurf-browser.org/netsurf-website.git/tree/330894bd3eefe5ecc...
The branch, master has been updated
via 330894bd3eefe5eccfcb3e3bcdd7edb1cc6a6259 (commit)
from c0eff0648746adb387b807ed542162e87e557332 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff http://git.netsurf-browser.org/netsurf-website.git/commit/?id=330894bd3ee...
commit 330894bd3eefe5eccfcb3e3bcdd7edb1cc6a6259
Author: Michael Drake <tlsa(a)netsurf-browser.org>
Commit: Michael Drake <tlsa(a)netsurf-browser.org>
Update for libcss 0.4.0
diff --git a/projects/libcss/index.en b/projects/libcss/index.en
index 366c065..bb5122a 100644
--- a/projects/libcss/index.en
+++ b/projects/libcss/index.en
@@ -65,6 +65,8 @@
<p>Most recent first:</p>
<dl class="releases">
+<dt>LibCSS 0.4.0</dt>
+<dd><a href="http://download.netsurf-browser.org/libs/releases/libcss-0.4.0-src.tar.gz">Tarball</a> – <a href="#changes-0.4.0">Changes</a></dd>
<dt>LibCSS 0.3.0</dt>
<dd><a href="http://download.netsurf-browser.org/libs/releases/libcss-0.3.0-src.tar.gz">Tarball</a> – <a href="#changes-0.3.0">Changes</a></dd>
<dt>LibCSS 0.2.0</dt>
@@ -84,6 +86,13 @@
<h2>Changes</h2>
<dl class="changes">
+<dt id="changes-0.4.0">LibCSS 0.4.0</dt>
+<dd><ul>
+<li>Added support for CSS3 overflow-x and overflow-y properties.</li>
+<li>Fix to !important handling with play-during property.</li>
+<li>Improved test coverage.</li>
+<li>API <a href="http://git.netsurf-browser.org/libcss.git/plain/docs/API-ABI-Changes">changes made</a>.</li>
+</ul></dd>
<dt id="changes-0.3.0">LibCSS 0.3.0</dt>
<dd><ul>
<li>Added support for the writing-mode property.</li>
-----------------------------------------------------------------------
Summary of changes:
projects/libcss/index.en | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/projects/libcss/index.en b/projects/libcss/index.en
index 366c065..bb5122a 100644
--- a/projects/libcss/index.en
+++ b/projects/libcss/index.en
@@ -65,6 +65,8 @@
<p>Most recent first:</p>
<dl class="releases">
+<dt>LibCSS 0.4.0</dt>
+<dd><a href="http://download.netsurf-browser.org/libs/releases/libcss-0.4.0-src.tar.gz">Tarball</a> – <a href="#changes-0.4.0">Changes</a></dd>
<dt>LibCSS 0.3.0</dt>
<dd><a href="http://download.netsurf-browser.org/libs/releases/libcss-0.3.0-src.tar.gz">Tarball</a> – <a href="#changes-0.3.0">Changes</a></dd>
<dt>LibCSS 0.2.0</dt>
@@ -84,6 +86,13 @@
<h2>Changes</h2>
<dl class="changes">
+<dt id="changes-0.4.0">LibCSS 0.4.0</dt>
+<dd><ul>
+<li>Added support for CSS3 overflow-x and overflow-y properties.</li>
+<li>Fix to !important handling with play-during property.</li>
+<li>Improved test coverage.</li>
+<li>API <a href="http://git.netsurf-browser.org/libcss.git/plain/docs/API-ABI-Changes">changes made</a>.</li>
+</ul></dd>
<dt id="changes-0.3.0">LibCSS 0.3.0</dt>
<dd><ul>
<li>Added support for the writing-mode property.</li>
--
NetSurf website source for *.netsurf-browser.org
8 years, 6 months
- 1
- 0
libcss: annotated tag release/0.4.0 updated. release/0.4.0
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/libcss.git/shortlog/9762b687dfe22f0a750e75...
...commit http://git.netsurf-browser.org/libcss.git/commit/9762b687dfe22f0a750e75ad...
...tree http://git.netsurf-browser.org/libcss.git/tree/9762b687dfe22f0a750e75ad26...
The annotated tag, release/0.4.0 has been updated
to 9762b687dfe22f0a750e75ad260377256cbdc854 (tag)
from b61990a7937fe3eedebe4c537c81264076d483ab (which is now obsolete)
tagging 2d7dfb09a66216660e2ade537953b53af865a649 (commit)
replaces release/0.3.1
tagged by Vincent Sanders
on Sat Aug 30 16:37:49 2014 -0700
- Log -----------------------------------------------------------------
Official Release
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)
iD8DBQBUAmBNiUwwPOvjHvURAjOoAJ0auDC5QzyvGm3Tkd7llTQ0DzkBDgCcCBxg
I9FjFA51P96LXrdj0aKJycs=
=7ux9
-----END PGP SIGNATURE-----
Vincent Sanders (1):
update component for release
-----------------------------------------------------------------------
--
Cascading Style Sheets library
8 years, 6 months
- 1
- 0
libcss: branch master updated. release/0.4.0-1-g2d7dfb0
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/libcss.git/shortlog/2d7dfb09a66216660e2ade...
...commit http://git.netsurf-browser.org/libcss.git/commit/2d7dfb09a66216660e2ade53...
...tree http://git.netsurf-browser.org/libcss.git/tree/2d7dfb09a66216660e2ade5379...
The branch, master has been updated
via 2d7dfb09a66216660e2ade537953b53af865a649 (commit)
from 1f7f45c3e940c7958cc0e4624c8bf1501690b171 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff http://git.netsurf-browser.org/libcss.git/commit/?id=2d7dfb09a66216660e2a...
commit 2d7dfb09a66216660e2ade537953b53af865a649
Author: Vincent Sanders <vince(a)kyllikki.org>
Commit: Vincent Sanders <vince(a)kyllikki.org>
update component for release
diff --git a/Makefile b/Makefile
index 8e69387..353b662 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
# Component settings
COMPONENT := css
-COMPONENT_VERSION := 0.3.1
+COMPONENT_VERSION := 0.4.0
# Default to a static library
COMPONENT_TYPE ?= lib-static
-----------------------------------------------------------------------
Summary of changes:
Makefile | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/Makefile b/Makefile
index 8e69387..353b662 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
# Component settings
COMPONENT := css
-COMPONENT_VERSION := 0.3.1
+COMPONENT_VERSION := 0.4.0
# Default to a static library
COMPONENT_TYPE ?= lib-static
--
Cascading Style Sheets library
8 years, 6 months
- 1
- 0
libcss: annotated tag release/0.4.0 created. release/0.4.0
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/libcss.git/shortlog/b61990a7937fe3eedebe4c...
...commit http://git.netsurf-browser.org/libcss.git/commit/b61990a7937fe3eedebe4c53...
...tree http://git.netsurf-browser.org/libcss.git/tree/b61990a7937fe3eedebe4c537c...
The annotated tag, release/0.4.0 has been created
at b61990a7937fe3eedebe4c537c81264076d483ab (tag)
tagging 1f7f45c3e940c7958cc0e4624c8bf1501690b171 (commit)
replaces release/0.3.0
tagged by Vincent Sanders
on Sat Aug 30 16:32:13 2014 -0700
- Log -----------------------------------------------------------------
Official Release
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)
iD8DBQBUAl79iUwwPOvjHvURAnSlAJ0RMkfpyFIZSCYmGaak7ac6iadzzACgk4F8
tmz/3kBFhgtuVKAluW0Rpgs=
=pIG/
-----END PGP SIGNATURE-----
Michael Drake (5):
Add support for CSS3 overflow-x and overflow-y properties.
Length of computed bits array has increased by one byte.
Fix warning.
Fix advancing when play-during rule has !important set.
Improve src/parse/important.c coverage to 98.4%
Vincent Sanders (1):
Update component version for release
-----------------------------------------------------------------------
--
Cascading Style Sheets library
8 years, 6 months
- 1
- 0
netsurf-website: branch master updated. c0eff0648746adb387b807ed542162e87e557332
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf-website.git/shortlog/c0eff0648746a...
...commit http://git.netsurf-browser.org/netsurf-website.git/commit/c0eff0648746adb...
...tree http://git.netsurf-browser.org/netsurf-website.git/tree/c0eff0648746adb38...
The branch, master has been updated
via c0eff0648746adb387b807ed542162e87e557332 (commit)
from 047f0c74fca9dce9b37695efb3ed7618955aaa9d (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff http://git.netsurf-browser.org/netsurf-website.git/commit/?id=c0eff064874...
commit c0eff0648746adb387b807ed542162e87e557332
Author: Michael Drake <tlsa(a)netsurf-browser.org>
Commit: Michael Drake <tlsa(a)netsurf-browser.org>
Update for NetSurf 3.2.
diff --git a/about/index.en b/about/index.en
index 6c772fe..071d216 100644
--- a/about/index.en
+++ b/about/index.en
@@ -133,6 +133,8 @@
<tr><th>Sep 2013</th><td>Redesigned treeviews</td></tr>
<tr><th>Dec 2013</th><td>Big LibCSS selection speedup</td></tr>
<tr><th>Apr 2014</th><td>NetSurf 3.1 released</td></tr>
+<tr><th>May 2014</th><td>Added disc cache feature</td></tr>
+<tr><th>Aug 2014</th><td>NetSurf 3.2 released</td></tr>
</table>
<div class="frontscreen"><p class="frontscreen"><a href="screenshots/images/riscos-wikipedia.png"><img src="screenshots/images/riscosthumb-wikipedia.png" alt="GTK NetSurf screenshot."></a> <span>A more recent NetSurf showing <em>Wikipedia</em>.</span></p></div>
diff --git a/about/news.en b/about/news.en
index 1cd7e07..6e5c526 100644
--- a/about/news.en
+++ b/about/news.en
@@ -58,6 +58,10 @@
<h1>News</h1>
<dl class="news">
+<dt><a href="/downloads/">NetSurf 3.2 released</a> <span>30 Aug 2014</span></dt>
+<dd>NetSurf 3.2 is primarily a bug-fix release. In addition to fixes, a disc cache feature has been added, and a little work has been done to improve CSS3 support. Several of the front ends have received quite a bit of attention, with new features and improvements; notably the GTK, AmigaOS and Framebuffer front ends. We recommend all users upgrade.</dd>
+<dt><a href="https://developers.google.com/open-source/soc/?csw=1">NetSurf in Google Summer of Code</a> <span>01 May 2014</span></dt>
+<dd>NetSurf is participating as a mentoring organisation in Google Summer of code again this year. We have a student called Rupinder Singh Khokhar who will be working on updating our core web technology libraries, LibDOM and LibHubbub, to bring them into line with the current versions of the specifications.</dd>
<dt><a href="/downloads/">NetSurf 3.1 released</a> <span>26 Apr 2014</span></dt>
<dd>NetSurf 3.1 contains many improvements over the previous release. The highlights include much faster CSS selection performance, faster start up time, new look and feel to the treeviews (hotlist/bookmarks, global history and cookie manager), improved options handling, undo/redo support in textareas, and general improvement of forms. Also included are many other additions, optimisations and bug fixes. We recommend that all users upgrade.</dd>
<dt><a href="/about/awards">NetSurf wins Award</a> <span>23 Jan 2014</span></dt>
diff --git a/downloads/amiga/index.en b/downloads/amiga/index.en
index 9b2aa72..7320423 100644
--- a/downloads/amiga/index.en
+++ b/downloads/amiga/index.en
@@ -63,7 +63,7 @@
<div class="downloadlatestouter">
<div class="downloadlatest">
<div class="downloadlatestbox">
-<p class="downloadmain downloadfirst"><a href="http://download.netsurf-browser.org/netsurf/releases/pre-built/amiga/nets..."><span>NetSurf 3.1 for AmigaOS</span> <span>(5.9MB)</span> <span class="downloaddate">26 Apr 2014</span></a></p>
+<p class="downloadmain downloadfirst"><a href="http://download.netsurf-browser.org/netsurf/releases/pre-built/amiga/nets..."><span>NetSurf 3.2 for AmigaOS</span> <span>(5.9MB)</span> <span class="downloaddate">30 Aug 2014</span></a></p>
<!--<p class="downloadinstructions"><a href="/documentation/roinfo#GettingStartedInstallation">Installation instructions</a></p>-->
<p class="preul">Requires:</p>
<ul>
@@ -72,7 +72,7 @@
</div>
<div class="downloadlatestbox downloadlast">
-<p class="downloadmain"><a href="http://download.netsurf-browser.org/netsurf/releases/source/netsurf-3.1-s..."><span>NetSurf 3.1 source code</span> <span>(2.9MB)</span> <span class="downloaddate">26 Apr 2014</span></a></p>
+<p class="downloadmain"><a href="http://download.netsurf-browser.org/netsurf/releases/source/netsurf-3.2-s..."><span>NetSurf 3.2 source code</span> <span>(2.9MB)</span> <span class="downloaddate">30 Aug 2014</span></a></p>
<p class="downloadinstructions"><a href="/downloads/source/#BuildInstructions">Build instructions</a></p>
<p class="preul">Build NetSurf for:</p>
<ul>
@@ -90,6 +90,13 @@
<h2>Previous releases</h2>
<dl>
+<dt>NetSurf 3.1</dt>
+<dd>
+<ul>
+<li><a href="http://download.netsurf-browser.org/netsurf/releases/pre-built/amiga/nets...">NetSurf 3.1 browser for AmigaOS 4</a> (26 Apr 2014)</li>
+<li><a href="http://download.netsurf-browser.org/netsurf/releases/source/netsurf-3.1-s...">NetSurf 3.1 source code</a> (26 Apr 2014)</li>
+</ul>
+</dd>
<dt>NetSurf 2.9</dt>
<dd>
<ul>
diff --git a/downloads/riscos/index.en b/downloads/riscos/index.en
index 3dd548b..d4e528a 100644
--- a/downloads/riscos/index.en
+++ b/downloads/riscos/index.en
@@ -63,7 +63,7 @@
<div class="downloadlatestouter">
<div class="downloadlatest">
<div class="downloadlatestbox">
-<p class="downloadmain downloadfirst"><a href="http://download.netsurf-browser.org/netsurf/releases/pre-built/riscos/net..."><span>NetSurf 3.1 for RISC OS</span> <span>(3.3MB)</span> <span class="downloaddate">26 Apr 2014</span></a></p>
+<p class="downloadmain downloadfirst"><a href="http://download.netsurf-browser.org/netsurf/releases/pre-built/riscos/net..."><span>NetSurf 3.2 for RISC OS</span> <span>(3.3MB)</span> <span class="downloaddate">30 Aug 2014</span></a></p>
<p class="downloadinstructions"><a href="/documentation/roinfo#GettingStartedInstallation">Installation instructions</a></p>
<p class="preul">Binary download includes:</p>
<ul>
@@ -81,7 +81,7 @@
</div>
<div class="downloadlatestbox downloadlast">
-<p class="downloadmain"><a href="http://download.netsurf-browser.org/netsurf/releases/source/netsurf-3.1-s..."><span>NetSurf 3.1 source code</span> <span>(2.9MB)</span> <span class="downloaddate">26 Apr 2014</span></a></p>
+<p class="downloadmain"><a href="http://download.netsurf-browser.org/netsurf/releases/source/netsurf-3.2-s..."><span>NetSurf 3.2 source code</span> <span>(2.9MB)</span> <span class="downloaddate">30 Aug 2014</span></a></p>
<p class="downloadinstructions"><a href="/downloads/source/#BuildInstructions">Build instructions</a></p>
<p class="preul">Build NetSurf for:</p>
<ul>
@@ -100,6 +100,13 @@
<h2>Previous releases</h2>
<dl>
+<dt>NetSurf 3.1</dt>
+<dd>
+<ul>
+<li><a href="http://download.netsurf-browser.org/netsurf/releases/pre-built/riscos/net...">NetSurf 3.1 browser for RISC OS</a> (26 Apr 2014)</li>
+<li><a href="http://download.netsurf-browser.org/netsurf/releases/source/netsurf-3.1-s...">NetSurf 3.1 source code</a> (26 Apr 2014)</li>
+</ul>
+</dd>
<dt>NetSurf 3.0</dt>
<dd>
<ul>
diff --git a/downloads/source/index.en b/downloads/source/index.en
index cc798ba..8519f1f 100644
--- a/downloads/source/index.en
+++ b/downloads/source/index.en
@@ -56,6 +56,7 @@
<p>The source code for each release version of NetSurf is available.</p>
<ul>
+<li><a href="http://download.netsurf-browser.org/netsurf/releases/source-full/netsurf-...">NetSurf 3.2 source code</a> (30 Aug 2014)</li>
<li><a href="http://download.netsurf-browser.org/netsurf/releases/source-full/netsurf-...">NetSurf 3.1 source code</a> (26 Apr 2014)</li>
<li><a href="http://download.netsurf-browser.org/netsurf/releases/source-full/netsurf-...">NetSurf 3.0 source code</a> (20 Apr 2013)</li>
<li><a href="http://download.netsurf-browser.org/netsurf/releases/source-full/netsurf-...">NetSurf 2.9 source code</a> (27 Mar 2012)</li>
diff --git a/index.en b/index.en
index e792ba0..42fc6fb 100644
--- a/index.en
+++ b/index.en
@@ -128,7 +128,7 @@
<div class="downloadbox">
<div class="downloadcontainer">
<div class="downloadcontent">
-<h2 id="downloadrelease"><a href="/downloads/">Download NetSurf 3.1</a></h2>
+<h2 id="downloadrelease"><a href="/downloads/">Download NetSurf 3.2</a></h2>
<ul>
<li><a href="/downloads/riscos/">For RISC OS</a></li>
<li><a href="/downloads/gtk/">For Linux</a></li>
@@ -147,18 +147,18 @@
<h2 id="news">Latest news</h2>
<dl class="frontnews">
+<dt><a href="/downloads/">NetSurf 3.2 released</a> <span>30 Aug 2014</span></dt>
+<dd>NetSurf 3.2 is primarily a bug-fix release. In addition to fixes, a disc cache feature has been added, and a little work has been done to improve CSS3 support. Several of the front ends have received quite a bit of attention, with new features and improvements; notably the GTK, AmigaOS and Framebuffer front ends. We recommend all users upgrade.</dd>
+<dt><a href="https://developers.google.com/open-source/soc/?csw=1">NetSurf in Google Summer of Code</a> <span>01 May 2014</span></dt>
+<dd>NetSurf is participating as a mentoring organisation in Google Summer of code again this year. We have a student called Rupinder Singh Khokhar who will be working on updating our core web technology libraries, LibDOM and LibHubbub, to bring them into line with the current versions of the specifications.</dd>
<dt><a href="/downloads/">NetSurf 3.1 released</a> <span>26 Apr 2014</span></dt>
<dd>NetSurf 3.1 contains many improvements over the previous release. The highlights include much faster CSS selection performance, faster start up time, new look and feel to the treeviews (hotlist/bookmarks, global history and cookie manager), improved options handling, undo/redo support in textareas, and general improvement of forms. Also included are many other additions, optimisations and bug fixes. We recommend that all users upgrade.</dd>
-<dt><a href="/about/awards">NetSurf wins Award</a> <span>23 Jan 2014</span></dt>
-<dd>NetSurf won the award for "best non-commercial product" at the 2012/2013 RISC OS Awards. Thanks to everyone that voted for us!</dd>
-<dt><a href="http://vincentsanders.blogspot.co.uk/2014/01/netsurf-developer-workshop-r...">NetSurf developer workshop report</a> <span>06 Jan 2014</span></dt>
-<dd>The NetSurf core developers gathered in Cambridge at the start of the year, and managed to do a considerable amount of work across various areas of the project. See the <a href="http://vincentsanders.blogspot.co.uk/2014/01/netsurf-developer-workshop-r...">developer workshop report</a> for more details. Thanks to <a href="http://www.collabora.com/">Collabora</a> for hosting the event.</dd>
</dl>
<p class="more"><a href="/about/news" class="seemore">See more news</a></p>
-<h2 id="features">NetSurf 3.1 features</h2>
+<h2 id="features">NetSurf 3.2 features</h2>
-<p>NetSurf 3.1 is available for: RISC OS; Linux and other UNIX-like systems; Mac OS X; and AmigaOS 4.</p>
+<p>NetSurf 3.2 is available for: RISC OS; Linux and other UNIX-like systems; Mac OS X; and AmigaOS 4.</p>
<dl>
<dt>General</dt>
-----------------------------------------------------------------------
Summary of changes:
about/index.en | 2 ++
about/news.en | 4 ++++
downloads/amiga/index.en | 11 +++++++++--
downloads/riscos/index.en | 11 +++++++++--
downloads/source/index.en | 1 +
index.en | 14 +++++++-------
6 files changed, 32 insertions(+), 11 deletions(-)
diff --git a/about/index.en b/about/index.en
index 6c772fe..071d216 100644
--- a/about/index.en
+++ b/about/index.en
@@ -133,6 +133,8 @@
<tr><th>Sep 2013</th><td>Redesigned treeviews</td></tr>
<tr><th>Dec 2013</th><td>Big LibCSS selection speedup</td></tr>
<tr><th>Apr 2014</th><td>NetSurf 3.1 released</td></tr>
+<tr><th>May 2014</th><td>Added disc cache feature</td></tr>
+<tr><th>Aug 2014</th><td>NetSurf 3.2 released</td></tr>
</table>
<div class="frontscreen"><p class="frontscreen"><a href="screenshots/images/riscos-wikipedia.png"><img src="screenshots/images/riscosthumb-wikipedia.png" alt="GTK NetSurf screenshot."></a> <span>A more recent NetSurf showing <em>Wikipedia</em>.</span></p></div>
diff --git a/about/news.en b/about/news.en
index 1cd7e07..6e5c526 100644
--- a/about/news.en
+++ b/about/news.en
@@ -58,6 +58,10 @@
<h1>News</h1>
<dl class="news">
+<dt><a href="/downloads/">NetSurf 3.2 released</a> <span>30 Aug 2014</span></dt>
+<dd>NetSurf 3.2 is primarily a bug-fix release. In addition to fixes, a disc cache feature has been added, and a little work has been done to improve CSS3 support. Several of the front ends have received quite a bit of attention, with new features and improvements; notably the GTK, AmigaOS and Framebuffer front ends. We recommend all users upgrade.</dd>
+<dt><a href="https://developers.google.com/open-source/soc/?csw=1">NetSurf in Google Summer of Code</a> <span>01 May 2014</span></dt>
+<dd>NetSurf is participating as a mentoring organisation in Google Summer of code again this year. We have a student called Rupinder Singh Khokhar who will be working on updating our core web technology libraries, LibDOM and LibHubbub, to bring them into line with the current versions of the specifications.</dd>
<dt><a href="/downloads/">NetSurf 3.1 released</a> <span>26 Apr 2014</span></dt>
<dd>NetSurf 3.1 contains many improvements over the previous release. The highlights include much faster CSS selection performance, faster start up time, new look and feel to the treeviews (hotlist/bookmarks, global history and cookie manager), improved options handling, undo/redo support in textareas, and general improvement of forms. Also included are many other additions, optimisations and bug fixes. We recommend that all users upgrade.</dd>
<dt><a href="/about/awards">NetSurf wins Award</a> <span>23 Jan 2014</span></dt>
diff --git a/downloads/amiga/index.en b/downloads/amiga/index.en
index 9b2aa72..7320423 100644
--- a/downloads/amiga/index.en
+++ b/downloads/amiga/index.en
@@ -63,7 +63,7 @@
<div class="downloadlatestouter">
<div class="downloadlatest">
<div class="downloadlatestbox">
-<p class="downloadmain downloadfirst"><a href="http://download.netsurf-browser.org/netsurf/releases/pre-built/amiga/nets..."><span>NetSurf 3.1 for AmigaOS</span> <span>(5.9MB)</span> <span class="downloaddate">26 Apr 2014</span></a></p>
+<p class="downloadmain downloadfirst"><a href="http://download.netsurf-browser.org/netsurf/releases/pre-built/amiga/nets..."><span>NetSurf 3.2 for AmigaOS</span> <span>(5.9MB)</span> <span class="downloaddate">30 Aug 2014</span></a></p>
<!--<p class="downloadinstructions"><a href="/documentation/roinfo#GettingStartedInstallation">Installation instructions</a></p>-->
<p class="preul">Requires:</p>
<ul>
@@ -72,7 +72,7 @@
</div>
<div class="downloadlatestbox downloadlast">
-<p class="downloadmain"><a href="http://download.netsurf-browser.org/netsurf/releases/source/netsurf-3.1-s..."><span>NetSurf 3.1 source code</span> <span>(2.9MB)</span> <span class="downloaddate">26 Apr 2014</span></a></p>
+<p class="downloadmain"><a href="http://download.netsurf-browser.org/netsurf/releases/source/netsurf-3.2-s..."><span>NetSurf 3.2 source code</span> <span>(2.9MB)</span> <span class="downloaddate">30 Aug 2014</span></a></p>
<p class="downloadinstructions"><a href="/downloads/source/#BuildInstructions">Build instructions</a></p>
<p class="preul">Build NetSurf for:</p>
<ul>
@@ -90,6 +90,13 @@
<h2>Previous releases</h2>
<dl>
+<dt>NetSurf 3.1</dt>
+<dd>
+<ul>
+<li><a href="http://download.netsurf-browser.org/netsurf/releases/pre-built/amiga/nets...">NetSurf 3.1 browser for AmigaOS 4</a> (26 Apr 2014)</li>
+<li><a href="http://download.netsurf-browser.org/netsurf/releases/source/netsurf-3.1-s...">NetSurf 3.1 source code</a> (26 Apr 2014)</li>
+</ul>
+</dd>
<dt>NetSurf 2.9</dt>
<dd>
<ul>
diff --git a/downloads/riscos/index.en b/downloads/riscos/index.en
index 3dd548b..d4e528a 100644
--- a/downloads/riscos/index.en
+++ b/downloads/riscos/index.en
@@ -63,7 +63,7 @@
<div class="downloadlatestouter">
<div class="downloadlatest">
<div class="downloadlatestbox">
-<p class="downloadmain downloadfirst"><a href="http://download.netsurf-browser.org/netsurf/releases/pre-built/riscos/net..."><span>NetSurf 3.1 for RISC OS</span> <span>(3.3MB)</span> <span class="downloaddate">26 Apr 2014</span></a></p>
+<p class="downloadmain downloadfirst"><a href="http://download.netsurf-browser.org/netsurf/releases/pre-built/riscos/net..."><span>NetSurf 3.2 for RISC OS</span> <span>(3.3MB)</span> <span class="downloaddate">30 Aug 2014</span></a></p>
<p class="downloadinstructions"><a href="/documentation/roinfo#GettingStartedInstallation">Installation instructions</a></p>
<p class="preul">Binary download includes:</p>
<ul>
@@ -81,7 +81,7 @@
</div>
<div class="downloadlatestbox downloadlast">
-<p class="downloadmain"><a href="http://download.netsurf-browser.org/netsurf/releases/source/netsurf-3.1-s..."><span>NetSurf 3.1 source code</span> <span>(2.9MB)</span> <span class="downloaddate">26 Apr 2014</span></a></p>
+<p class="downloadmain"><a href="http://download.netsurf-browser.org/netsurf/releases/source/netsurf-3.2-s..."><span>NetSurf 3.2 source code</span> <span>(2.9MB)</span> <span class="downloaddate">30 Aug 2014</span></a></p>
<p class="downloadinstructions"><a href="/downloads/source/#BuildInstructions">Build instructions</a></p>
<p class="preul">Build NetSurf for:</p>
<ul>
@@ -100,6 +100,13 @@
<h2>Previous releases</h2>
<dl>
+<dt>NetSurf 3.1</dt>
+<dd>
+<ul>
+<li><a href="http://download.netsurf-browser.org/netsurf/releases/pre-built/riscos/net...">NetSurf 3.1 browser for RISC OS</a> (26 Apr 2014)</li>
+<li><a href="http://download.netsurf-browser.org/netsurf/releases/source/netsurf-3.1-s...">NetSurf 3.1 source code</a> (26 Apr 2014)</li>
+</ul>
+</dd>
<dt>NetSurf 3.0</dt>
<dd>
<ul>
diff --git a/downloads/source/index.en b/downloads/source/index.en
index cc798ba..8519f1f 100644
--- a/downloads/source/index.en
+++ b/downloads/source/index.en
@@ -56,6 +56,7 @@
<p>The source code for each release version of NetSurf is available.</p>
<ul>
+<li><a href="http://download.netsurf-browser.org/netsurf/releases/source-full/netsurf-...">NetSurf 3.2 source code</a> (30 Aug 2014)</li>
<li><a href="http://download.netsurf-browser.org/netsurf/releases/source-full/netsurf-...">NetSurf 3.1 source code</a> (26 Apr 2014)</li>
<li><a href="http://download.netsurf-browser.org/netsurf/releases/source-full/netsurf-...">NetSurf 3.0 source code</a> (20 Apr 2013)</li>
<li><a href="http://download.netsurf-browser.org/netsurf/releases/source-full/netsurf-...">NetSurf 2.9 source code</a> (27 Mar 2012)</li>
diff --git a/index.en b/index.en
index e792ba0..42fc6fb 100644
--- a/index.en
+++ b/index.en
@@ -128,7 +128,7 @@
<div class="downloadbox">
<div class="downloadcontainer">
<div class="downloadcontent">
-<h2 id="downloadrelease"><a href="/downloads/">Download NetSurf 3.1</a></h2>
+<h2 id="downloadrelease"><a href="/downloads/">Download NetSurf 3.2</a></h2>
<ul>
<li><a href="/downloads/riscos/">For RISC OS</a></li>
<li><a href="/downloads/gtk/">For Linux</a></li>
@@ -147,18 +147,18 @@
<h2 id="news">Latest news</h2>
<dl class="frontnews">
+<dt><a href="/downloads/">NetSurf 3.2 released</a> <span>30 Aug 2014</span></dt>
+<dd>NetSurf 3.2 is primarily a bug-fix release. In addition to fixes, a disc cache feature has been added, and a little work has been done to improve CSS3 support. Several of the front ends have received quite a bit of attention, with new features and improvements; notably the GTK, AmigaOS and Framebuffer front ends. We recommend all users upgrade.</dd>
+<dt><a href="https://developers.google.com/open-source/soc/?csw=1">NetSurf in Google Summer of Code</a> <span>01 May 2014</span></dt>
+<dd>NetSurf is participating as a mentoring organisation in Google Summer of code again this year. We have a student called Rupinder Singh Khokhar who will be working on updating our core web technology libraries, LibDOM and LibHubbub, to bring them into line with the current versions of the specifications.</dd>
<dt><a href="/downloads/">NetSurf 3.1 released</a> <span>26 Apr 2014</span></dt>
<dd>NetSurf 3.1 contains many improvements over the previous release. The highlights include much faster CSS selection performance, faster start up time, new look and feel to the treeviews (hotlist/bookmarks, global history and cookie manager), improved options handling, undo/redo support in textareas, and general improvement of forms. Also included are many other additions, optimisations and bug fixes. We recommend that all users upgrade.</dd>
-<dt><a href="/about/awards">NetSurf wins Award</a> <span>23 Jan 2014</span></dt>
-<dd>NetSurf won the award for "best non-commercial product" at the 2012/2013 RISC OS Awards. Thanks to everyone that voted for us!</dd>
-<dt><a href="http://vincentsanders.blogspot.co.uk/2014/01/netsurf-developer-workshop-r...">NetSurf developer workshop report</a> <span>06 Jan 2014</span></dt>
-<dd>The NetSurf core developers gathered in Cambridge at the start of the year, and managed to do a considerable amount of work across various areas of the project. See the <a href="http://vincentsanders.blogspot.co.uk/2014/01/netsurf-developer-workshop-r...">developer workshop report</a> for more details. Thanks to <a href="http://www.collabora.com/">Collabora</a> for hosting the event.</dd>
</dl>
<p class="more"><a href="/about/news" class="seemore">See more news</a></p>
-<h2 id="features">NetSurf 3.1 features</h2>
+<h2 id="features">NetSurf 3.2 features</h2>
-<p>NetSurf 3.1 is available for: RISC OS; Linux and other UNIX-like systems; Mac OS X; and AmigaOS 4.</p>
+<p>NetSurf 3.2 is available for: RISC OS; Linux and other UNIX-like systems; Mac OS X; and AmigaOS 4.</p>
<dl>
<dt>General</dt>
--
NetSurf website source for *.netsurf-browser.org
8 years, 6 months
- 1
- 0
netsurf: branch master updated. release/3.2-8-gf2ba351
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/f2ba35133be84e0ec24a2...
...commit http://git.netsurf-browser.org/netsurf.git/commit/f2ba35133be84e0ec24a2dc...
...tree http://git.netsurf-browser.org/netsurf.git/tree/f2ba35133be84e0ec24a2dc75...
The branch, master has been updated
via f2ba35133be84e0ec24a2dc756a5719623674f1a (commit)
from 34d7edcdc61151cfc979120d67977ed45687c1dd (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=f2ba35133be84e0ec24...
commit f2ba35133be84e0ec24a2dc756a5719623674f1a
Author: Michael Drake <tlsa(a)netsurf-browser.org>
Commit: Michael Drake <tlsa(a)netsurf-browser.org>
Remove MimeMan stuff from !Cache.
diff --git a/riscos/distribution/!Boot/Resources/!Cache/Caches/Single/MimeMan/MimeBase,ffd b/riscos/distribution/!Boot/Resources/!Cache/Caches/Single/MimeMan/MimeBase,ffd
deleted file mode 100644
index 905a788..0000000
Binary files a/riscos/distribution/!Boot/Resources/!Cache/Caches/Single/MimeMan/MimeBase,ffd and /dev/null differ
diff --git a/riscos/distribution/!Boot/Resources/!Cache/Caches/Single/MimeMan/PluginMime,ffd b/riscos/distribution/!Boot/Resources/!Cache/Caches/Single/MimeMan/PluginMime,ffd
deleted file mode 100644
index e0d18d5..0000000
Binary files a/riscos/distribution/!Boot/Resources/!Cache/Caches/Single/MimeMan/PluginMime,ffd and /dev/null differ
-----------------------------------------------------------------------
Summary of changes:
.../!Cache/Caches/Single/MimeMan/MimeBase,ffd | Bin 53248 -> 0 bytes
.../!Cache/Caches/Single/MimeMan/PluginMime,ffd | Bin 53248 -> 0 bytes
2 files changed, 0 insertions(+), 0 deletions(-)
delete mode 100644 riscos/distribution/!Boot/Resources/!Cache/Caches/Single/MimeMan/MimeBase,ffd
delete mode 100644 riscos/distribution/!Boot/Resources/!Cache/Caches/Single/MimeMan/PluginMime,ffd
diff --git a/riscos/distribution/!Boot/Resources/!Cache/Caches/Single/MimeMan/MimeBase,ffd b/riscos/distribution/!Boot/Resources/!Cache/Caches/Single/MimeMan/MimeBase,ffd
deleted file mode 100644
index 905a788..0000000
Binary files a/riscos/distribution/!Boot/Resources/!Cache/Caches/Single/MimeMan/MimeBase,ffd and /dev/null differ
diff --git a/riscos/distribution/!Boot/Resources/!Cache/Caches/Single/MimeMan/PluginMime,ffd b/riscos/distribution/!Boot/Resources/!Cache/Caches/Single/MimeMan/PluginMime,ffd
deleted file mode 100644
index e0d18d5..0000000
Binary files a/riscos/distribution/!Boot/Resources/!Cache/Caches/Single/MimeMan/PluginMime,ffd and /dev/null differ
--
NetSurf Browser
8 years, 6 months
- 1
- 0
netsurf: branch master updated. release/3.2-7-g34d7edc
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/34d7edcdc61151cfc9791...
...commit http://git.netsurf-browser.org/netsurf.git/commit/34d7edcdc61151cfc979120...
...tree http://git.netsurf-browser.org/netsurf.git/tree/34d7edcdc61151cfc979120d6...
The branch, master has been updated
via 34d7edcdc61151cfc979120d67977ed45687c1dd (commit)
from 5cd61f2ef4449b43ffd9348fa9c72cbbf0abb5a7 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=34d7edcdc61151cfc97...
commit 34d7edcdc61151cfc979120d67977ed45687c1dd
Author: Michael Drake <tlsa(a)netsurf-browser.org>
Commit: Michael Drake <tlsa(a)netsurf-browser.org>
Remove debug logging.
diff --git a/amiga/font.c b/amiga/font.c
index 7af7056..de84a04 100755
--- a/amiga/font.c
+++ b/amiga/font.c
@@ -356,11 +356,6 @@ bool nsfont_split(const plot_font_style_t *fstyle,
*char_offset = length;
*actual_x = tx;
-
- LOG(("Split %u chars at %ipx: "
- "Split at char %i (%ipx) - %.*s",
- length, x, *char_offset, *actual_x,
- *char_offset, string));
return true;
}
-----------------------------------------------------------------------
Summary of changes:
amiga/font.c | 5 -----
1 files changed, 0 insertions(+), 5 deletions(-)
diff --git a/amiga/font.c b/amiga/font.c
index 7af7056..de84a04 100755
--- a/amiga/font.c
+++ b/amiga/font.c
@@ -356,11 +356,6 @@ bool nsfont_split(const plot_font_style_t *fstyle,
*char_offset = length;
*actual_x = tx;
-
- LOG(("Split %u chars at %ipx: "
- "Split at char %i (%ipx) - %.*s",
- length, x, *char_offset, *actual_x,
- *char_offset, string));
return true;
}
--
NetSurf Browser
8 years, 6 months
- 1
- 0
libnsbmp: branch master updated. release/0.1.1-1-ge16c2f0
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/libnsbmp.git/shortlog/e16c2f086e2fc2f08124...
...commit http://git.netsurf-browser.org/libnsbmp.git/commit/e16c2f086e2fc2f08124c4...
...tree http://git.netsurf-browser.org/libnsbmp.git/tree/e16c2f086e2fc2f08124c485...
The branch, master has been updated
via e16c2f086e2fc2f08124c485c9edb6869a090e4b (commit)
from 493c32aea4e49c6ed0021ac367dd727fb95ba9b6 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff http://git.netsurf-browser.org/libnsbmp.git/commit/?id=e16c2f086e2fc2f081...
commit e16c2f086e2fc2f08124c485c9edb6869a090e4b
Author: Daniel Silverstone <dsilvers(a)digital-scurf.org>
Commit: Daniel Silverstone <dsilvers(a)digital-scurf.org>
We don't need read_int8 right now
diff --git a/src/libnsbmp.c b/src/libnsbmp.c
index bcbf21a..5d20d7c 100644
--- a/src/libnsbmp.c
+++ b/src/libnsbmp.c
@@ -84,9 +84,11 @@
#define ICO_FILE_HEADER_SIZE 6
#define ICO_DIR_ENTRY_SIZE 16
+#ifdef WE_NEED_INT8_READING_NOW
static inline int8_t read_int8(uint8_t *data, unsigned int o) {
return (int8_t) data[o];
}
+#endif
static inline uint8_t read_uint8(uint8_t *data, unsigned int o) {
return (uint8_t) data[o];
-----------------------------------------------------------------------
Summary of changes:
src/libnsbmp.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/src/libnsbmp.c b/src/libnsbmp.c
index bcbf21a..5d20d7c 100644
--- a/src/libnsbmp.c
+++ b/src/libnsbmp.c
@@ -84,9 +84,11 @@
#define ICO_FILE_HEADER_SIZE 6
#define ICO_DIR_ENTRY_SIZE 16
+#ifdef WE_NEED_INT8_READING_NOW
static inline int8_t read_int8(uint8_t *data, unsigned int o) {
return (int8_t) data[o];
}
+#endif
static inline uint8_t read_uint8(uint8_t *data, unsigned int o) {
return (uint8_t) data[o];
--
NetSurf BMP Decoder
8 years, 6 months
- 1
- 0
netsurf-all: branch master updated. release/3.2
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf-all.git/shortlog/6cf757e6f023c3187...
...commit http://git.netsurf-browser.org/netsurf-all.git/commit/6cf757e6f023c318701...
...tree http://git.netsurf-browser.org/netsurf-all.git/tree/6cf757e6f023c31870128...
The branch, master has been updated
via 6cf757e6f023c31870128c6223eb51f94c3f2f80 (commit)
from 67e26b0b6bdf7866c97653646a8988de4b53a494 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff http://git.netsurf-browser.org/netsurf-all.git/commit/?id=6cf757e6f023c31...
commit 6cf757e6f023c31870128c6223eb51f94c3f2f80
Author: Vincent Sanders <vince(a)kyllikki.org>
Commit: Vincent Sanders <vince(a)kyllikki.org>
fix host tools to be built with host tools rules
diff --git a/Makefile b/Makefile
index 627578a..ff7f351 100644
--- a/Makefile
+++ b/Makefile
@@ -96,7 +96,7 @@ $(TMP_PREFIX)/build-stamp:
mkdir -p $(TMP_PREFIX)/lib
mkdir -p $(TMP_PREFIX)/bin
$(foreach L,$(NSLIB_TARG),$(call do_prefix_install,$(L)))
- $(foreach L,$(NSHOST_TARG),$(call do_prefix_install,$(L)))
+ $(foreach L,$(NSHOST_TARG),$(call do_host_prefix_install,$(L)))
$(MAKE) --directory=$(NETSURF_TARG) PREFIX=$(PREFIX) TARGET=$(TARGET) $(NETSURF_CONFIG)
touch $@
-----------------------------------------------------------------------
Summary of changes:
Makefile | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/Makefile b/Makefile
index 627578a..ff7f351 100644
--- a/Makefile
+++ b/Makefile
@@ -96,7 +96,7 @@ $(TMP_PREFIX)/build-stamp:
mkdir -p $(TMP_PREFIX)/lib
mkdir -p $(TMP_PREFIX)/bin
$(foreach L,$(NSLIB_TARG),$(call do_prefix_install,$(L)))
- $(foreach L,$(NSHOST_TARG),$(call do_prefix_install,$(L)))
+ $(foreach L,$(NSHOST_TARG),$(call do_host_prefix_install,$(L)))
$(MAKE) --directory=$(NETSURF_TARG) PREFIX=$(PREFIX) TARGET=$(TARGET) $(NETSURF_CONFIG)
touch $@
--
NetSurf 'all' tree. Typically used for releases
8 years, 6 months
- 1
- 0