commit 41305b23558a51c5a6fa33bc7476df1ed6221667
from: Jeff Sickel <jas@corpus-callosum.com>
date: Wed Dec 03 08:13:38 2008 UTC

libdraw: add borderop

commit - f4d56d7218169816fcbc304c7848d48ab78315a4
commit + 41305b23558a51c5a6fa33bc7476df1ed6221667
blob - 39f2b81ab2eb52990d6c9c09c485da4812c27191
blob + 1fa5dea1da9176cb8d7a5beeb5df4d46be20de36
--- man/man3/draw.3
+++ man/man3/draw.3
@@ -5,7 +5,7 @@ replclipr, line, lineop, poly, polyop, fillpoly, fillp
 bezspline, bezsplineop, bezsplinepts, fillbezier, fillbezierop, 
 fillbezspline, fillbezsplineop, ellipse, ellipseop, 
 fillellipse, fillellipseop, arc, arcop, fillarc, fillarcop, 
-icossin, icossin2, border, string, stringop, stringn, stringnop,
+icossin, icossin2, border, borderop, string, stringop, stringn, stringnop,
 runestring, runestringop, runestringn, runestringnop, stringbg, 
 stringbgop, stringnbg, stringnbgop, runestringbg, runestringbgop,
 runestringnbg, runestringnbgop, _string, ARROW, drawsetdebug \- graphics functions
@@ -156,6 +156,9 @@ int	icossin(int deg, int *cosp, int *sinp)
 int	icossin2(int x, int y, int *cosp, int *sinp)
 .PB
 void	border(Image *dst, Rectangle r, int i, Image *color, Point sp)
+.PB
+void	borderop(Image *im, Rectangle r, int i, Image *color, Point sp,
+		Drawop op)
 .br
 .PB
 Point	string(Image *dst, Point p, Image *src, Point sp,
blob - 22637dfadafbae63ddda09b55bbc80fa5fbf60e0
blob + 52eaa152435587be91ff2ce06b88b124cc8cb204
--- src/libdraw/border.c
+++ src/libdraw/border.c
@@ -3,19 +3,25 @@
 #include <draw.h>
 
 void
-border(Image *im, Rectangle r, int i, Image *color, Point sp)
+borderop(Image *im, Rectangle r, int i, Image *color, Point sp, Drawop op)
 {
 	if(i < 0){
 		r = insetrect(r, i);
 		sp = addpt(sp, Pt(i,i));
 		i = -i;
 	}
-	draw(im, Rect(r.min.x, r.min.y, r.max.x, r.min.y+i),
-		color, nil, sp);
-	draw(im, Rect(r.min.x, r.max.y-i, r.max.x, r.max.y),
-		color, nil, Pt(sp.x, sp.y+Dy(r)-i));
-	draw(im, Rect(r.min.x, r.min.y+i, r.min.x+i, r.max.y-i),
-		color, nil, Pt(sp.x, sp.y+i));
-	draw(im, Rect(r.max.x-i, r.min.y+i, r.max.x, r.max.y-i),
-		color, nil, Pt(sp.x+Dx(r)-i, sp.y+i));
+	drawop(im, Rect(r.min.x, r.min.y, r.max.x, r.min.y+i),
+		color, nil, sp, op);
+	drawop(im, Rect(r.min.x, r.max.y-i, r.max.x, r.max.y),
+		color, nil, Pt(sp.x, sp.y+Dy(r)-i), op);
+	drawop(im, Rect(r.min.x, r.min.y+i, r.min.x+i, r.max.y-i),
+		color, nil, Pt(sp.x, sp.y+i), op);
+	drawop(im, Rect(r.max.x-i, r.min.y+i, r.max.x, r.max.y-i),
+		color, nil, Pt(sp.x+Dx(r)-i, sp.y+i), op);
 }
+
+void
+border(Image *im, Rectangle r, int i, Image *color, Point sp)
+{
+	borderop(im, r, i, color, sp, SoverD);
+}