EliasFleckenstein03
/
plan9front
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libdraw: add missing borderop() (thanks aiju)

front
cinap_lenrek 2014-07-21 18:10:58 +02:00
parent 1021caa395
commit 168b9f3de4
2 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sys/man/2/draw
View File

@ -152,6 +152,9 @@ int icossin(int deg, int *cosp, int *sinp)
int icossin2(int x, int y, int *cosp, int *sinp) int icossin2(int x, int y, int *cosp, int *sinp)
.PB .PB
void border(Image *dst, Rectangle r, int i, Image *color, Point sp) void border(Image *dst, Rectangle r, int i, Image *color, Point sp)
.PB
void borderop(Image *dst, Rectangle r, int i, Image *color, Point sp,
Drawop op)
.br .br
.PB .PB
Point string(Image *dst, Point p, Image *src, Point sp, Point string(Image *dst, Point p, Image *src, Point sp,

24
sys/src/libdraw/border.c
View File

@ -3,19 +3,25 @@
#include <draw.h> #include <draw.h>
void 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){ if(i < 0){
r = insetrect(r, i); r = insetrect(r, i);
sp = addpt(sp, Pt(i,i)); sp = addpt(sp, Pt(i,i));
i = -i; i = -i;
} }
draw(im, Rect(r.min.x, r.min.y, r.max.x, r.min.y+i), drawop(im, Rect(r.min.x, r.min.y, r.max.x, r.min.y+i),
color, nil, sp); color, nil, sp, op);
draw(im, Rect(r.min.x, r.max.y-i, r.max.x, r.max.y), 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)); color, nil, Pt(sp.x, sp.y+Dy(r)-i), op);
draw(im, Rect(r.min.x, r.min.y+i, r.min.x+i, r.max.y-i), 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)); color, nil, Pt(sp.x, sp.y+i), op);
draw(im, Rect(r.max.x-i, r.min.y+i, r.max.x, r.max.y-i), 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)); 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);
} }