diff options
Diffstat (limited to 'generic/Item.c')
-rw-r--r-- | generic/Item.c | 109 |
1 files changed, 72 insertions, 37 deletions
diff --git a/generic/Item.c b/generic/Item.c index a9a5e3a..6e9cfbf 100644 --- a/generic/Item.c +++ b/generic/Item.c @@ -3136,7 +3136,7 @@ CurrentClip(WidgetInfo *wi, */ static void PushClip(WidgetInfo *wi, - ZnPoly *poly, + ZnTriStrip *tristrip, ZnBool simple, ZnBool set_gc) { @@ -3146,14 +3146,14 @@ PushClip(WidgetInfo *wi, ClipState *previous_clip=NULL; Region reg, reg_op, reg_to; XRectangle rect; - XPoint *xpts; + XPoint xpts[3], *xp2, *xpts2; - if (poly->num_contours == 0) { + if (tristrip->num_strips == 0) { return; } - max_num_pts = poly->contours[0].num_points; - for (j = 0; j < poly->num_contours; j++) { - num_pts = poly->contours[j].num_points; + max_num_pts = tristrip->strips[0].num_points; + for (j = 0; j < tristrip->num_strips; j++) { + num_pts = tristrip->strips[j].num_points; if (num_pts > max_num_pts) { num_pts = max_num_pts; } @@ -3176,39 +3176,63 @@ PushClip(WidgetInfo *wi, * Compute the local region. */ if (simple) { - rect.x = poly->contours[0].points[0].x; - rect.y = poly->contours[0].points[0].y; - rect.width = poly->contours[0].points[1].x - poly->contours[0].points[0].x; - rect.height = poly->contours[0].points[1].y - poly->contours[0].points[0].y; + rect.x = tristrip->strips[0].points[0].x; + rect.y = tristrip->strips[0].points[0].y; + rect.width = tristrip->strips[0].points[1].x - tristrip->strips[0].points[0].x; + rect.height = tristrip->strips[0].points[1].y - tristrip->strips[0].points[0].y; reg = XCreateRegion(); XUnionRectWithRegion(&rect, reg, reg); /*printf("Adding a simple clip: %d, %d, %d, %d\n", rect.x, rect.y, rect.width, rect.height);*/ } else { - xpts = (XPoint *) ZnMalloc(max_num_pts * sizeof(XPoint)); reg = XCreateRegion(); - for (j = 0; j < poly->num_contours; j++) { - num_pts = poly->contours[j].num_points; - p = poly->contours[j].points; - for (i = 0; i < num_pts; i++, p++) { - xpts[i].x = p->x; - xpts[i].y = p->y; - } - reg_op = XPolygonRegion(xpts, num_pts, EvenOddRule); - reg_to = XCreateRegion(); - if (poly->holes[j]) { - XSubtractRegion(reg, reg_op, reg_to); + for (j = 0; j < tristrip->num_strips; j++) { + num_pts = tristrip->strips[j].num_points; + p = tristrip->strips[j].points; + /* + * In case of a fan we benefit from the fact that + * ALL the contour vertices are included in + * the tristrip, so we can use the corresponding + * polygon instead of going through all the triangles. + */ + if (tristrip->fan) { + xp2 = xpts2 = ZnMalloc(num_pts*sizeof(XPoint)); + for (i = 0 ; i < num_pts; i++, p++, xp2++) { + xp2->x = (short) p->x; + xp2->y = (short) p->y; + } + reg_op = XPolygonRegion(xpts2, num_pts, EvenOddRule); + reg_to = XCreateRegion(); + XUnionRegion(reg, reg_op, reg_to); + XDestroyRegion(reg); + XDestroyRegion(reg_op); + reg = reg_to; + ZnFree(xpts2); } else { - XUnionRegion(reg, reg_op, reg_to); + xpts[0].x = p->x; + xpts[0].y = p->y; + p++; + xpts[1].x = p->x; + xpts[1].y = p->y; + p++; + for (i = 2 ; i < num_pts; i++, p++) { + xpts[2].x = p->x; + xpts[2].y = p->y; + reg_op = XPolygonRegion(xpts, 3, EvenOddRule); + reg_to = XCreateRegion(); + XUnionRegion(reg, reg_op, reg_to); + XDestroyRegion(reg); + XDestroyRegion(reg_op); + reg = reg_to; + xpts[0] = xpts[1]; + xpts[1] = xpts[2]; + } } - XDestroyRegion(reg); - XDestroyRegion(reg_op); - reg = reg_to; } - ZnFree(xpts); } + /* * Combine with previous region if any. */ @@ -3238,9 +3262,7 @@ PushClip(WidgetInfo *wi, glStencilFunc(GL_EQUAL, num_clips, 0xFF); glStencilOp(GL_KEEP, GL_INCR, GL_INCR); glColorMask(GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE); -#if 0 if (simple) { -#endif /* printf("Clip box is : %d, %d, %d, %d, num_clips : %d\n", rect.x, rect.y, rect.width, rect.height, num_clips);*/ glBegin(GL_QUADS); @@ -3249,11 +3271,24 @@ PushClip(WidgetInfo *wi, glVertex2f(wi->current_clip->clip_box.corner.x, wi->current_clip->clip_box.corner.y); glVertex2f(wi->current_clip->clip_box.corner.x, wi->current_clip->clip_box.orig.y); glEnd(); -#if 0 } else { + for (j = 0; j < tristrip->num_strips; j++) { + num_pts = tristrip->strips[j].num_points; + p = tristrip->strips[j].points; + if (tristrip->fan) { + glBegin(GL_TRIANGLE_FAN); + glVertex2f(tristrip->center.x, tristrip->center.y); + } + else { + glBegin(GL_TRIANGLE_STRIP); + } + for (i = 0; i < num_pts; i++, p++) { + glVertex2f(p->x, p->y); + } + glEnd(); + } } -#endif glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE); glStencilFunc(GL_EQUAL, num_clips+1, 0xFF); glStencilOp(GL_KEEP, GL_KEEP, GL_KEEP); @@ -4061,7 +4096,7 @@ FieldsEngine(FieldSet field_set, ZnBBox label_clip_box, clip_bbox, bbox, *global_clip_box; ZnBBox text_bbox, clip_text_bbox; ZnPoint pts[2]; - ZnPoly poly; + ZnTriStrip tristrip; ZnPoint text_pos; ZnBBox pm_bbox, clip_pm_bbox; ZnBool restore = False; @@ -4149,8 +4184,8 @@ FieldsEngine(FieldSet field_set, /*printf("clip\n");*/ pts[0] = clip_bbox.orig; pts[1] = clip_bbox.corner; - POLY_CONTOUR1(&poly, pts, 2); - PushClip(wi, &poly, True, True); + TRI_STRIP1(&tristrip, pts, 2); + PushClip(wi, &tristrip, True, True); } (*cb)(wi, field_ptr, &bbox, &clip_bbox, &pm_bbox, &clip_pm_bbox, &text_pos); @@ -4709,7 +4744,7 @@ Repair(WidgetInfo *wi) XGCValues values; XRectangle r; ZnPoint pts[2]; - ZnPoly poly; + ZnTriStrip tristrip; if (wi->render) { #ifdef GLX @@ -4782,8 +4817,8 @@ Repair(WidgetInfo *wi) r.height = wi->damaged_area.corner.y - wi->damaged_area.orig.y; pts[0] = wi->damaged_area.orig; pts[1] = wi->damaged_area.corner; - POLY_CONTOUR1(&poly, pts, 2); - PushClip(wi, &poly, True, True); + TRI_STRIP1(&tristrip, pts, 2); + PushClip(wi, &tristrip, True, True); /* Fill the background of the double buffer pixmap. */ if (wi->tile == ZnUnspecifiedImage) { |