mirrors/foot
1
0
Fork 0
mirror of https://codeberg.org/dnkl/foot.git synced 2026-04-08 08:20:59 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

box-drawing: use fill_boxes() instead of fill_rectangles()

Browse source
This commit is contained in:
Daniel Eklöf 2021-05-07 14:09:31 +02:00
parent b771a28d17
commit b48414e72c
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
1 changed files with 20 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

50
box-drawing.c
View file

@ -64,18 +64,13 @@ _thickness(struct buf *buf, enum thickness thick)
static void NOINLINE static void NOINLINE
_hline(struct buf *buf, int x1, int x2, int y, int thick) _hline(struct buf *buf, int x1, int x2, int y, int thick)
{ {
x1 = min(max(x1, 0), buf->width); pixman_box32_t box = {
x2 = min(max(x2, 0), buf->width); .x1 = min(max(x1, 0), buf->width),
.x2 = min(max(x2, 0), buf->width),
int y1 = max(y, 0); .y1 = min(max(y, 0), buf->height),
int y2 = min(max(y + thick, 0), buf->height); .y2 = min(max(y + thick, 0), buf->height),
int width = x2 - x1; };
int height = y2 - y1; pixman_image_fill_boxes(PIXMAN_OP_SRC, buf->pix, &white, 1, &box);
pixman_rectangle16_t rect = {
.x = x1, .y = y1, .width = width, .height = height};
pixman_image_fill_rectangles(PIXMAN_OP_SRC, buf->pix, &white, 1, &rect);
} }
#define hline(x1, x2, y, thick) _hline(buf, x1, x2, y, thick) #define hline(x1, x2, y, thick) _hline(buf, x1, x2, y, thick)
@ -83,18 +78,13 @@ _hline(struct buf *buf, int x1, int x2, int y, int thick)
static void NOINLINE static void NOINLINE
_vline(struct buf *buf, int y1, int y2, int x, int thick) _vline(struct buf *buf, int y1, int y2, int x, int thick)
{ {
y1 = min(max(y1, 0), buf->height); pixman_box32_t box = {
y2 = min(max(y2, 0), buf->height); .x1 = min(max(x, 0), buf->width),
.x2 = min(max(x + thick, 0), buf->width),
int x1 = max(x, 0); .y1 = min(max(y1, 0), buf->height),
int x2 = min(max(x + thick, 0), buf->width); .y2 = min(max(y2, 0), buf->height),
int width = x2 - x1; };
int height = y2 - y1; pixman_image_fill_boxes(PIXMAN_OP_SRC, buf->pix, &white, 1, &box);
pixman_rectangle16_t rect = {
.x = x1, .y = y1, .width = width, .height = height};
pixman_image_fill_rectangles(PIXMAN_OP_SRC, buf->pix, &white, 1, &rect);
} }
#define vline(y1, y2, x, thick) _vline(buf, y1, y2, x, thick) #define vline(y1, y2, x, thick) _vline(buf, y1, y2, x, thick)
@ -102,12 +92,12 @@ _vline(struct buf *buf, int y1, int y2, int x, int thick)
static void NOINLINE static void NOINLINE
_rect(struct buf *buf, int x1, int y1, int x2, int y2) _rect(struct buf *buf, int x1, int y1, int x2, int y2)
{ {
x1 = min(max(x1, 0), buf->width); pixman_box32_t box = {
y1 = min(max(y1, 0), buf->height); .x1 = min(max(x1, 0), buf->width),
x2 = min(max(x2, 0), buf->width); .y1 = min(max(y1, 0), buf->height),
y2 = min(max(y2, 0), buf->height); .x2 = min(max(x2, 0), buf->width),
.y2 = min(max(y2, 0), buf->height),
pixman_box32_t box = {.x1 = x1, .y1 = y1, .x2 = x2, .y2 = y2}; };
pixman_image_fill_boxes(PIXMAN_OP_SRC, buf->pix, &white, 1, &box); pixman_image_fill_boxes(PIXMAN_OP_SRC, buf->pix, &white, 1, &box);
} }