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

box-drawing: quadrants: convert quad_*() macros to functions

Browse source 
This reduces the size of the foot binary by ~4K; all the quad
macros called ceil() and floor() twice per macro, which caused many
float -> int -> float conversions in the expanded code.

By using functions instead, there’s no expansion - the conversion only
happens in one (well, four) places.
This commit is contained in:
Daniel Eklöf 2021-01-01 21:56:53 +01:00
parent c75192b4f8
commit f7669c1e24
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
1 changed files with 44 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

69
box-drawing.c
View file

@ -114,11 +114,6 @@ _rect(struct buf *buf, int x1, int y1, int x2, int y2)
#define vline_middle_up(thick) _vline_middle_up(thick, thick) #define vline_middle_up(thick) _vline_middle_up(thick, thick)
#define vline_middle_down(thick) _vline_middle_down(thick, thick) #define vline_middle_down(thick) _vline_middle_down(thick, thick)
#define quad_upper_left() rect(0, 0, ceil(buf->width / 2.), ceil(buf->height / 2.))
#define quad_upper_right() rect(floor(buf->width / 2.), 0, buf->width, ceil(buf->height / 2.))
#define quad_lower_left() rect(0, floor(buf->height / 2.), ceil(buf->width / 2.), buf->height)
#define quad_lower_right() rect(floor(buf->width / 2.), floor(buf->height / 2.), buf->width, buf->height)
static void static void
draw_box_drawings_light_horizontal(struct buf *buf) draw_box_drawings_light_horizontal(struct buf *buf)
{ {
@ -1627,74 +1622,98 @@ draw_right_one_eighth_block(struct buf *buf)
rect(buf->width - round(buf->width / 8.), 0, buf->width, buf->height); rect(buf->width - round(buf->width / 8.), 0, buf->width, buf->height);
} }
static void
quad_upper_left(struct buf *buf)
{
rect(0, 0, ceil(buf->width / 2.), ceil(buf->height / 2.));
}
static void
quad_upper_right(struct buf *buf)
{
rect(floor(buf->width / 2.), 0, buf->width, ceil(buf->height / 2.));
}
static void
quad_lower_left(struct buf *buf)
{
rect(0, floor(buf->height / 2.), ceil(buf->width / 2.), buf->height);
}
static void
quad_lower_right(struct buf *buf)
{
rect(floor(buf->width / 2.), floor(buf->height / 2.), buf->width, buf->height);
}
static void static void
draw_quadrant_lower_left(struct buf *buf) draw_quadrant_lower_left(struct buf *buf)
{ {
quad_lower_left(); quad_lower_left(buf);
} }
static void static void
draw_quadrant_lower_right(struct buf *buf) draw_quadrant_lower_right(struct buf *buf)
{ {
quad_lower_right(); quad_lower_right(buf);
} }
static void static void
draw_quadrant_upper_left(struct buf *buf) draw_quadrant_upper_left(struct buf *buf)
{ {
quad_upper_left(); quad_upper_left(buf);
} }
static void static void
draw_quadrant_upper_left_and_lower_left_and_lower_right(struct buf *buf) draw_quadrant_upper_left_and_lower_left_and_lower_right(struct buf *buf)
{ {
quad_upper_left(); quad_upper_left(buf);
quad_lower_left(); quad_lower_left(buf);
quad_lower_right(); quad_lower_right(buf);
} }
static void static void
draw_quadrant_upper_left_and_lower_right(struct buf *buf) draw_quadrant_upper_left_and_lower_right(struct buf *buf)
{ {
quad_upper_left(); quad_upper_left(buf);
quad_lower_right(); quad_lower_right(buf);
} }
static void static void
draw_quadrant_upper_left_and_upper_right_and_lower_left(struct buf *buf) draw_quadrant_upper_left_and_upper_right_and_lower_left(struct buf *buf)
{ {
quad_upper_left(); quad_upper_left(buf);
quad_upper_right(); quad_upper_right(buf);
quad_lower_left(); quad_lower_left(buf);
} }
static void static void
draw_quadrant_upper_left_and_upper_right_and_lower_right(struct buf *buf) draw_quadrant_upper_left_and_upper_right_and_lower_right(struct buf *buf)
{ {
quad_upper_left(); quad_upper_left(buf);
quad_upper_right(); quad_upper_right(buf);
quad_lower_right(); quad_lower_right(buf);
} }
static void static void
draw_quadrant_upper_right(struct buf *buf) draw_quadrant_upper_right(struct buf *buf)
{ {
quad_upper_right(); quad_upper_right(buf);
} }
static void static void
draw_quadrant_upper_right_and_lower_left(struct buf *buf) draw_quadrant_upper_right_and_lower_left(struct buf *buf)
{ {
quad_upper_right(); quad_upper_right(buf);
quad_lower_left(); quad_lower_left(buf);
} }
static void static void
draw_quadrant_upper_right_and_lower_left_and_lower_right(struct buf *buf) draw_quadrant_upper_right_and_lower_left_and_lower_right(struct buf *buf)
{ {
quad_upper_right(); quad_upper_right(buf);
quad_lower_left(); quad_lower_left(buf);
quad_lower_right(); quad_lower_right(buf);
} }
#define sextant_upper_left() rect(0, 0, round(buf->width / 2.), round(buf->height / 3.)) #define sextant_upper_left() rect(0, 0, round(buf->width / 2.), round(buf->height / 3.))