![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
index 0b1297df6bb916bf06cabc5594e8eaa834ebb58f..c5551695fc84514c788a005b19f49df9e0845f15 100644 (file)
+#include <display/canvas-arena.h>
#include <display/nr-arena.h>
#include <display/nr-arena-shape.h>
#include "display/nr-filter.h"
#include "prefs-utils.h"
#include "sp-filter.h"
#include "sp-gaussian-blur.h"
+#include "inkscape-cairo.h"
#include <cairo.h>
static void nr_arena_shape_set_child_position(NRArenaItem *item, NRArenaItem *child, NRArenaItem *ref);
static guint nr_arena_shape_update(NRArenaItem *item, NRRectL *area, NRGC *gc, guint state, guint reset);
-static unsigned int nr_arena_shape_render(NRArenaItem *item, NRRectL *area, NRPixBlock *pb, unsigned int flags);
+static unsigned int nr_arena_shape_render(cairo_t *ct, NRArenaItem *item, NRRectL *area, NRPixBlock *pb, unsigned int flags);
static guint nr_arena_shape_clip(NRArenaItem *item, NRRectL *area, NRPixBlock *pb);
static NRArenaItem *nr_arena_shape_pick(NRArenaItem *item, NR::Point p, double delta, unsigned int sticky);
nr_matrix_set_identity(&shape->cached_sctm);
shape->markers = NULL;
+
+ shape->last_pick = NULL;
+ shape->repick_after = 0;
}
static void
@@ -378,11 +383,12 @@ nr_arena_shape_update(NRArenaItem *item, NRRectL *area, NRGC *gc, guint state, g
}
item->render_opacity = FALSE;
}
- if ( item->render_opacity == TRUE
- && shape->_fill.paint.type() != NRArenaShape::Paint::NONE
- && shape->_stroke.paint.type() != NRArenaShape::Paint::NONE )
+ if ( (shape->_fill.paint.type() != NRArenaShape::Paint::NONE &&
+ shape->_stroke.paint.type() != NRArenaShape::Paint::NONE)
+ || (shape->markers)
+ )
{
- // don't merge item opacity with paint opacity if there is a stroke on the fill
+ // don't merge item opacity with paint opacity if there is a stroke on the fill, or markers on stroke
item->render_opacity = FALSE;
}
bool outline = (NR_ARENA_ITEM(shape)->arena->rendermode == RENDERMODE_OUTLINE);
if (outline) {
- // cairo does not need the livarot path for rendering... but unfortunately it's still used for picking
- // FIXME: switch picking to using cairo_in_stroke?
- //return;
+ // cairo does not need the livarot path for rendering
+ return;
}
+ // after switching normal stroke rendering to cairo too, optimize this: lower tolerance, disregard dashes
+ // (since it will only be used for picking, not for rendering)
+
if (outline ||
((shape->_stroke.paint.type() != NRArenaShape::Paint::NONE) &&
( fabs(shape->_stroke.width * scale) > 0.01 ))) { // sinon c'est 0=oon veut pas de bord
}
}
-/** Feeds path-creating calls to the cairo context translating them from the SPCurve, with the given transform and shift */
-static void
-feed_curve_to_cairo (cairo_t *ct, SPCurve *curve, NR::Matrix trans, NR::Point shift)
+// cairo outline rendering:
+static unsigned int
+cairo_arena_shape_render_outline(cairo_t *ct, NRArenaItem *item, NR::Maybe<NR::Rect> area)
{
- NR::Point lastX(0,0);
- bool closed = false;
- NArtBpath *bpath = SP_CURVE_BPATH(curve);
- for (int i = 0; bpath[i].code != NR_END; i++) {
- switch (bpath[i].code) {
- case NR_MOVETO_OPEN:
- case NR_MOVETO:
- if (closed) cairo_close_path(ct);
- closed = (bpath[i].code == NR_MOVETO);
- lastX[NR::X] = bpath[i].x3;
- lastX[NR::Y] = bpath[i].y3;
- lastX *= trans;
- lastX -= shift;
- cairo_move_to(ct, lastX[NR::X], lastX[NR::Y]);
- break;
-
- case NR_LINETO:
- lastX[NR::X] = bpath[i].x3;
- lastX[NR::Y] = bpath[i].y3;
- lastX *= trans;
- lastX -= shift;
- cairo_line_to(ct, lastX[NR::X], lastX[NR::Y]);
- break;
-
- case NR_CURVETO: {
- NR::Point tm1, tm2, tm3;
- tm1[0]=bpath[i].x1;
- tm1[1]=bpath[i].y1;
- tm2[0]=bpath[i].x2;
- tm2[1]=bpath[i].y2;
- tm3[0]=bpath[i].x3;
- tm3[1]=bpath[i].y3;
- tm1 *= trans;
- tm2 *= trans;
- tm3 *= trans;
- tm1 -= shift;
- tm2 -= shift;
- tm3 -= shift;
- cairo_curve_to (ct, tm1[NR::X], tm1[NR::Y], tm2[NR::X], tm2[NR::Y], tm3[NR::X], tm3[NR::Y]);
- break;
- }
+ NRArenaShape *shape = NR_ARENA_SHAPE(item);
- default:
- break;
- }
- }
+ if (!ct)
+ return item->state;
+
+ guint32 rgba = NR_ARENA_ITEM(shape)->arena->outlinecolor;
+ // FIXME: we use RGBA buffers but cairo writes BGRA (on i386), so we must cheat
+ // by setting color channels in the "wrong" order
+ cairo_set_source_rgba(ct, SP_RGBA32_B_F(rgba), SP_RGBA32_G_F(rgba), SP_RGBA32_R_F(rgba), SP_RGBA32_A_F(rgba));
+
+ cairo_set_line_width(ct, 0.5);
+ cairo_set_tolerance(ct, 1.25); // low quality, but good enough for outline mode
+ cairo_new_path(ct);
+
+ feed_curve_to_cairo (ct, SP_CURVE_BPATH(shape->curve), NR::Matrix(shape->ctm), area, true, 0);
+
+ cairo_stroke(ct);
+
+ return item->state;
}
-/** Creates a cairo context to render to the given pixblock on the given area */
-cairo_t *
-nr_create_cairo_context (NRRectL *area, NRPixBlock *pb)
+// cairo stroke rendering (flat color only so far!):
+// works on canvas, but wrongs the colors in nonpremul buffers: icons and png export
+// (need to switch them to premul before this can be enabled)
+void
+cairo_arena_shape_render_stroke(NRArenaItem *item, NRRectL *area, NRPixBlock *pb)
{
- if (!nr_rect_l_test_intersect (&pb->area, area))
- return NULL;
+ NRArenaShape *shape = NR_ARENA_SHAPE(item);
+ SPStyle const *style = shape->style;
+
+ float const scale = NR_MATRIX_DF_EXPANSION(shape->ctm);
+
+ if (fabs(shape->_stroke.width * scale) < 0.01)
+ return;
+
+ cairo_t *ct = nr_create_cairo_context (area, pb);
+
+ if (!ct)
+ return;
+
+ guint32 rgba;
+ if ( item->render_opacity ) {
+ rgba = sp_color_get_rgba32_falpha(&shape->_stroke.paint.color(),
+ shape->_stroke.opacity *
+ SP_SCALE24_TO_FLOAT(style->opacity.value));
+ } else {
+ rgba = sp_color_get_rgba32_falpha(&shape->_stroke.paint.color(),
+ shape->_stroke.opacity);
+ }
+
+ // FIXME: we use RGBA buffers but cairo writes BGRA (on i386), so we must cheat
+ // by setting color channels in the "wrong" order
+ cairo_set_source_rgba(ct, SP_RGBA32_B_F(rgba), SP_RGBA32_G_F(rgba), SP_RGBA32_R_F(rgba), SP_RGBA32_A_F(rgba));
+
+ float style_width = MAX(0.125, shape->_stroke.width * scale);
+ cairo_set_line_width(ct, style_width);
+
+ switch (shape->_stroke.cap) {
+ case NRArenaShape::BUTT_CAP:
+ cairo_set_line_cap(ct, CAIRO_LINE_CAP_BUTT);
+ break;
+ case NRArenaShape::ROUND_CAP:
+ cairo_set_line_cap(ct, CAIRO_LINE_CAP_ROUND);
+ break;
+ case NRArenaShape::SQUARE_CAP:
+ cairo_set_line_cap(ct, CAIRO_LINE_CAP_SQUARE);
+ break;
+ }
+ switch (shape->_stroke.join) {
+ case NRArenaShape::MITRE_JOIN:
+ cairo_set_line_join(ct, CAIRO_LINE_JOIN_MITER);
+ break;
+ case NRArenaShape::ROUND_JOIN:
+ cairo_set_line_join(ct, CAIRO_LINE_JOIN_ROUND);
+ break;
+ case NRArenaShape::BEVEL_JOIN:
+ cairo_set_line_join(ct, CAIRO_LINE_JOIN_BEVEL);
+ break;
+ }
+
+ cairo_set_miter_limit (ct, style->stroke_miterlimit.value);
+
+ if (style->stroke_dash.n_dash) {
+ NRVpathDash dash;
+ dash.offset = style->stroke_dash.offset * scale;
+ dash.n_dash = style->stroke_dash.n_dash;
+ dash.dash = g_new(double, dash.n_dash);
+ for (int i = 0; i < dash.n_dash; i++) {
+ dash.dash[i] = style->stroke_dash.dash[i] * scale;
+ }
+ cairo_set_dash (ct, dash.dash, dash.n_dash, dash.offset);
+ g_free(dash.dash);
+ }
+
+ cairo_set_tolerance(ct, 0.1);
+ cairo_new_path(ct);
+
+ feed_curve_to_cairo (ct, SP_CURVE_BPATH(shape->curve), NR::Matrix(shape->ctm), area->upgrade(), true, style_width);
+
+ cairo_stroke(ct);
- NRRectL clip;
- nr_rect_l_intersect (&clip, &pb->area, area);
- unsigned char *dpx = NR_PIXBLOCK_PX (pb) + (clip.y0 - pb->area.y0) * pb->rs + NR_PIXBLOCK_BPP (pb) * (clip.x0 - pb->area.x0);
- int width = area->x1 - area->x0;
- int height = area->y1 - area->y0;
- cairo_surface_t* cst = cairo_image_surface_create_for_data
- (dpx,
- (pb->mode == NR_PIXBLOCK_MODE_R8G8B8A8P? CAIRO_FORMAT_ARGB32 : (pb->mode == NR_PIXBLOCK_MODE_R8G8B8? CAIRO_FORMAT_RGB24 : CAIRO_FORMAT_A8)),
- width,
- height,
- pb->rs);
- cairo_t *ct = cairo_create (cst);
-
- return ct;
+ cairo_surface_t *cst = cairo_get_target(ct);
+ cairo_destroy (ct);
+ cairo_surface_finish (cst);
+ cairo_surface_destroy (cst);
+
+ pb->empty = FALSE;
}
* Renders the item. Markers are just composed into the parent buffer.
*/
static unsigned int
-nr_arena_shape_render(NRArenaItem *item, NRRectL *area, NRPixBlock *pb, unsigned int flags)
+nr_arena_shape_render(cairo_t *ct, NRArenaItem *item, NRRectL *area, NRPixBlock *pb, unsigned int flags)
{
NRArenaShape *shape = NR_ARENA_SHAPE(item);
@@ -811,35 +857,13 @@ nr_arena_shape_render(NRArenaItem *item, NRRectL *area, NRPixBlock *pb, unsigned
bool outline = (NR_ARENA_ITEM(shape)->arena->rendermode == RENDERMODE_OUTLINE);
- // cairo outline rendering:
- // fixme: if no problems reported, remove old outline stuff
- if (outline) {
-
- cairo_t *ct = nr_create_cairo_context (area, pb);
-
- if (!ct)
- return item->state;
-
- guint32 rgba = NR_ARENA_ITEM(shape)->arena->outlinecolor;
- cairo_set_source_rgba(ct, SP_RGBA32_R_F(rgba), SP_RGBA32_G_F(rgba), SP_RGBA32_B_F(rgba), SP_RGBA32_A_F(rgba));
-
- cairo_set_line_width(ct, 0.5);
- cairo_set_tolerance(ct, 1.25); // low quality, but good enough for outline mode
- cairo_new_path(ct);
-
- feed_curve_to_cairo (ct, shape->curve, NR::Matrix(shape->ctm), NR::Point(area->x0, area->y0));
-
- cairo_stroke(ct);
-
- cairo_surface_t *cst = cairo_get_target(ct);
- cairo_destroy (ct);
- cairo_surface_finish (cst);
- cairo_surface_destroy (cst);
+ if (outline) { // cairo outline rendering
pb->empty = FALSE;
+ unsigned int ret = cairo_arena_shape_render_outline (ct, item, (&pb->area)->upgrade());
+ if (ret & NR_ARENA_ITEM_STATE_INVALID) return ret;
- return item->state;
- }
+ } else {
if ( shape->delayed_shp ) {
if ( nr_rect_l_test_intersect(area, &item->bbox) ) {
@@ -862,7 +886,7 @@ nr_arena_shape_render(NRArenaItem *item, NRRectL *area, NRPixBlock *pb, unsigned
}
SPStyle const *style = shape->style;
- if ( shape->fill_shp && !outline) {
+ if (shape->fill_shp) {
NRPixBlock m;
guint32 rgba;
@@ -900,9 +924,12 @@ nr_arena_shape_render(NRArenaItem *item, NRRectL *area, NRPixBlock *pb, unsigned
nr_pixblock_release(&m);
}
- if ( shape->stroke_shp ) {
- NRPixBlock m;
+ if (shape->stroke_shp && shape->_stroke.paint.type() == NRArenaShape::Paint::COLOR) {
+
+ // cairo_arena_shape_render_stroke(item, area, pb);
+
guint32 rgba;
+ NRPixBlock m;
nr_pixblock_setup_fast(&m, NR_PIXBLOCK_MODE_A8, area->x0, area->y0, area->x1, area->y1, TRUE);
@@ -916,10 +943,7 @@ nr_arena_shape_render(NRArenaItem *item, NRRectL *area, NRPixBlock *pb, unsigned
nr_pixblock_render_shape_mask_or(m, shape->stroke_shp);
m.empty = FALSE;
- if (shape->_stroke.paint.type() == NRArenaShape::Paint::COLOR || outline) {
- if (outline) {
- rgba = NR_ARENA_ITEM(shape)->arena->outlinecolor;
- } else if ( item->render_opacity ) {
+ if ( item->render_opacity ) {
rgba = sp_color_get_rgba32_falpha(&shape->_stroke.paint.color(),
shape->_stroke.opacity *
SP_SCALE24_TO_FLOAT(style->opacity.value));
@@ -929,34 +953,52 @@ nr_arena_shape_render(NRArenaItem *item, NRRectL *area, NRPixBlock *pb, unsigned
}
nr_blit_pixblock_mask_rgba32(pb, &m, rgba);
pb->empty = FALSE;
- } else if (shape->_stroke.paint.type() == NRArenaShape::Paint::SERVER) {
- if (shape->stroke_painter) {
- nr_arena_render_paintserver_fill(pb, area, shape->stroke_painter, shape->_stroke.opacity, &m);
- }
+
+ nr_pixblock_release(&m);
+
+ } else if (shape->stroke_shp && shape->_stroke.paint.type() == NRArenaShape::Paint::SERVER) {
+
+ NRPixBlock m;
+
+ nr_pixblock_setup_fast(&m, NR_PIXBLOCK_MODE_A8, area->x0, area->y0, area->x1, area->y1, TRUE);
+
+ // if memory allocation failed, abort render
+ if (m.size != NR_PIXBLOCK_SIZE_TINY && m.data.px == NULL) {
+ nr_pixblock_release (&m);
+ return (item->state);
+ }
+
+ m.visible_area = pb->visible_area;
+ nr_pixblock_render_shape_mask_or(m, shape->stroke_shp);
+ m.empty = FALSE;
+
+ if (shape->stroke_painter) {
+ nr_arena_render_paintserver_fill(pb, area, shape->stroke_painter, shape->_stroke.opacity, &m);
}
nr_pixblock_release(&m);
}
- /* Just compose children into parent buffer */
+ } // non-cairo non-outline branch
+
+ /* Render markers into parent buffer */
for (NRArenaItem *child = shape->markers; child != NULL; child = child->next) {
- unsigned int ret;
- ret = nr_arena_item_invoke_render(child, area, pb, flags);
+ unsigned int ret = nr_arena_item_invoke_render(ct, child, area, pb, flags);
if (ret & NR_ARENA_ITEM_STATE_INVALID) return ret;
}
return item->state;
}
+
+// cairo clipping: this basically works except for the stride-must-be-divisible-by-4 cairo bug;
+// reenable this when the bug is fixed and remove the rest of this function
static guint
-nr_arena_shape_clip(NRArenaItem *item, NRRectL *area, NRPixBlock *pb)
+cairo_arena_shape_clip(NRArenaItem *item, NRRectL *area, NRPixBlock *pb)
{
NRArenaShape *shape = NR_ARENA_SHAPE(item);
if (!shape->curve) return item->state;
-/*
-// cairo clipping: this basically works except for the stride-must-be-divisible-by-4 cairo bug;
-// reenable this when the bug is fixed and remove the rest of this function
cairo_t *ct = nr_create_cairo_context (area, pb);
if (!ct)
cairo_new_path(ct);
- feed_curve_to_cairo (ct, shape->curve, NR::Matrix(shape->ctm), NR::Point(area->x0, area->y0));
+ feed_curve_to_cairo (ct, SP_CURVE_BPATH(shape->curve), NR::Matrix(shape->ctm), (area)->upgrade(), false, 0);
cairo_fill(ct);
pb->empty = FALSE;
return item->state;
-*/
+}
+
+
+static guint
+nr_arena_shape_clip(NRArenaItem *item, NRRectL *area, NRPixBlock *pb)
+{
+ //return cairo_arena_shape_clip(item, area, pb);
+ NRArenaShape *shape = NR_ARENA_SHAPE(item);
+ if (!shape->curve) return item->state;
if ( shape->delayed_shp || shape->fill_shp == NULL) { // we need a fill shape no matter what
if ( nr_rect_l_test_intersect(area, &item->bbox) ) {
@@ -1029,77 +1079,89 @@ nr_arena_shape_pick(NRArenaItem *item, NR::Point p, double delta, unsigned int /
{
NRArenaShape *shape = NR_ARENA_SHAPE(item);
+ if (shape->repick_after > 0)
+ shape->repick_after--;
+
+ if (shape->repick_after > 0) // we are a slow, huge path. skip this pick, returning what was returned last time
+ return shape->last_pick;
+
if (!shape->curve) return NULL;
if (!shape->style) return NULL;
- if ( shape->delayed_shp ) {
- NRRectL area, updateArea;
- area.x0=(int)floor(p[NR::X]);
- area.x1=(int)ceil(p[NR::X]);
- area.y0=(int)floor(p[NR::Y]);
- area.y1=(int)ceil(p[NR::Y]);
- int idelta = (int)ceil(delta) + 1;
- // njh: inset rect
- area.x0-=idelta;
- area.x1+=idelta;
- area.y0-=idelta;
- area.y1+=idelta;
- if ( nr_rect_l_test_intersect(&area, &item->bbox) ) {
- NRGC tempGC(NULL);
- tempGC.transform=shape->ctm;
- updateArea = item->bbox;
- if (shape->cached_stroke)
- nr_rect_l_intersect (&updateArea, &updateArea, &shape->cached_sarea);
+ if (SP_SCALE24_TO_FLOAT(shape->style->opacity.value) == 0) // fully transparent, no pick
+ return NULL;
- shape->delayed_shp = false;
- nr_arena_shape_update_stroke(shape, &tempGC, &updateArea);
- nr_arena_shape_update_fill(shape, &tempGC, &updateArea);
- /* NRRect bbox;
- bbox.x0 = bbox.y0 = bbox.x1 = bbox.y1 = 0.0;
- nr_arena_shape_add_bboxes(shape,bbox);
- item->bbox.x0 = (gint32)(bbox.x0 - 1.0F);
- item->bbox.y0 = (gint32)(bbox.y0 - 1.0F);
- item->bbox.x1 = (gint32)(bbox.x1 + 1.0F);
- item->bbox.y1 = (gint32)(bbox.y1 + 1.0F);
- shape->approx_bbox=item->bbox;*/
- }
- }
+ GTimeVal tstart, tfinish;
+ g_get_current_time (&tstart);
bool outline = (NR_ARENA_ITEM(shape)->arena->rendermode == RENDERMODE_OUTLINE);
- if (item->state & NR_ARENA_ITEM_STATE_RENDER) {
- if (shape->fill_shp && (shape->_fill.paint.type() != NRArenaShape::Paint::NONE)) {
- if (shape->fill_shp->PtWinding(p) > 0 ) return item;
- }
- if (shape->stroke_shp && (shape->_stroke.paint.type() != NRArenaShape::Paint::NONE || outline)) {
- if (shape->stroke_shp->PtWinding(p) > 0 ) return item;
- }
- if (delta > 1e-3) {
- if (shape->fill_shp && (shape->_fill.paint.type() != NRArenaShape::Paint::NONE)) {
- if (distanceLessThanOrEqual(shape->fill_shp, p, delta)) return item;
+ double width;
+ if (outline) {
+ width = 0.5;
+ } else if (shape->_stroke.paint.type() != NRArenaShape::Paint::NONE && shape->_stroke.opacity > 1e-3) {
+ float const scale = NR_MATRIX_DF_EXPANSION(&shape->ctm);
+ width = MAX(0.125, shape->_stroke.width * scale) / 2;
+ } else {
+ width = 0;
+ }
+
+ NRBPath bp;
+ bp.path = SP_CURVE_BPATH(shape->curve);
+ double dist = NR_HUGE;
+ int wind = 0;
+ bool needfill = (shape->_fill.paint.type() != NRArenaShape::Paint::NONE
+ && shape->_fill.opacity > 1e-3 && !outline);
+
+ if (item->arena->canvasarena) {
+ NR::Rect viewbox = item->arena->canvasarena->item.canvas->getViewbox();
+ viewbox.growBy (width);
+ nr_path_matrix_point_bbox_wind_distance(&bp, shape->ctm, p, NULL, needfill? &wind : NULL, &dist, 0.5, &viewbox);
+ } else {
+ nr_path_matrix_point_bbox_wind_distance(&bp, shape->ctm, p, NULL, needfill? &wind : NULL, &dist, 0.5, NULL);
+ }
+
+ g_get_current_time (&tfinish);
+ glong this_pick = (tfinish.tv_sec - tstart.tv_sec) * 1000000 + (tfinish.tv_usec - tstart.tv_usec);
+ //g_print ("pick time %lu\n", this_pick);
+
+ if (this_pick > 10000) { // slow picking, remember to skip several new picks
+ shape->repick_after = this_pick / 5000;
+ }
+
+ // covered by fill?
+ if (needfill) {
+ if (!shape->style->fill_rule.computed) {
+ if (wind != 0) {
+ shape->last_pick = item;
+ return item;
}
- if (shape->stroke_shp && (shape->_stroke.paint.type() != NRArenaShape::Paint::NONE || outline)) {
- if (distanceLessThanOrEqual(shape->stroke_shp, p, delta)) return item;
+ } else {
+ if (wind & 0x1) {
+ shape->last_pick = item;
+ return item;
}
}
- } else {
- NRBPath bp;
- bp.path = SP_CURVE_BPATH(shape->curve);
- double dist = NR_HUGE;
- int wind = 0;
- nr_path_matrix_point_bbox_wind_distance(&bp, shape->ctm, p, NULL, &wind, &dist, NR_EPSILON);
- if (shape->_fill.paint.type() != NRArenaShape::Paint::NONE) {
- if (!shape->style->fill_rule.computed) {
- if (wind != 0) return item;
- } else {
- if (wind & 0x1) return item;
- }
+ }
+
+ // close to the edge, as defined by strokewidth and delta?
+ // this ignores dashing (as if the stroke is solid) and always works as if caps are round
+ if (needfill || width > 0) { // if either fill or stroke visible,
+ if ((dist - width) < delta) {
+ shape->last_pick = item;
+ return item;
}
- if (shape->_stroke.paint.type() != NRArenaShape::Paint::NONE || outline) {
- /* fixme: We do not take stroke width into account here (Lauris) */
- if (dist < delta) return item;
+ }
+
+ // if not picked on the shape itself, try its markers
+ for (NRArenaItem *child = shape->markers; child != NULL; child = child->next) {
+ NRArenaItem *ret = nr_arena_item_invoke_pick(child, p, delta, 0);
+ if (ret) {
+ shape->last_pick = item;
+ return item;
}
}
+ shape->last_pick = NULL;
return NULL;
}