aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Sickel <jas@corpus-callosum.com>2008-12-03 02:13:38 -0600
committerJeff Sickel <jas@corpus-callosum.com>2008-12-03 02:13:38 -0600
commit41305b23558a51c5a6fa33bc7476df1ed6221667 (patch)
tree4b3c4efb2492c765fe1e35b475e2858439c5f8a8
parentf4d56d7218169816fcbc304c7848d48ab78315a4 (diff)
downloadplan9port-41305b23558a51c5a6fa33bc7476df1ed6221667.tar.gz
plan9port-41305b23558a51c5a6fa33bc7476df1ed6221667.tar.bz2
plan9port-41305b23558a51c5a6fa33bc7476df1ed6221667.zip
libdraw: add borderop
-rw-r--r--man/man3/draw.35
-rw-r--r--src/libdraw/border.c24
2 files changed, 19 insertions, 10 deletions
diff --git a/man/man3/draw.3 b/man/man3/draw.3
index 39f2b81a..1fa5dea1 100644
--- a/man/man3/draw.3
+++ b/man/man3/draw.3
@@ -5,7 +5,7 @@ replclipr, line, lineop, poly, polyop, fillpoly, fillpolyop, bezier, bezierop,
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,
diff --git a/src/libdraw/border.c b/src/libdraw/border.c
index 22637dfa..52eaa152 100644
--- a/src/libdraw/border.c
+++ b/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);
}