mirror of
https://codeberg.org/dnkl/foot.git
synced 2026-04-11 08:21:01 -04:00
box-drawings: implement octants
This commit is contained in:
Daniel Eklöf
parent
768f254286
commit
9a1b59adae
5 changed files with 467 additions and 12 deletions
|
|
@ -61,6 +61,9 @@
|
||||||
* Unicode data files updated to Unicode 16. Foot uses these to
|
* Unicode data files updated to Unicode 16. Foot uses these to
|
||||||
determine which VS-15 and VS-16 sequences are valid, and which are
|
determine which VS-15 and VS-16 sequences are valid, and which are
|
||||||
not.
|
not.
|
||||||
|
* Box drawing characters U+1CD00...U+1CDE5 (the _"octants"_ from the
|
||||||
|
_"Symbols for Legacy Computing Supplement"_ codepoint range, added
|
||||||
|
in Unicode 16.0).
|
||||||
|
|
||||||
|
|
||||||
### Changed
|
### Changed
|
||||||
|
|
|
||||||
450
box-drawing.c
450
box-drawing.c
|
|
@ -33,9 +33,12 @@ struct buf {
|
||||||
|
|
||||||
int thickness[2];
|
int thickness[2];
|
||||||
|
|
||||||
/* For sextants and wedges */
|
/* For octants, sextants and wedges */
|
||||||
int x_halfs[2];
|
int x_halfs[2];
|
||||||
int y_thirds[2];
|
int y_thirds[2];
|
||||||
|
|
||||||
|
/* For octants */
|
||||||
|
int y_quads[3];
|
||||||
};
|
};
|
||||||
|
|
||||||
static const pixman_color_t white = {0xffff, 0xffff, 0xffff, 0xffff};
|
static const pixman_color_t white = {0xffff, 0xffff, 0xffff, 0xffff};
|
||||||
|
|
@ -2213,6 +2216,7 @@ draw_sextant(struct buf *buf, char32_t wc)
|
||||||
LOWER_RIGHT = 1 << 5,
|
LOWER_RIGHT = 1 << 5,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
/* TODO: move this to a separate file? */
|
||||||
static const uint8_t matrix[60] = {
|
static const uint8_t matrix[60] = {
|
||||||
/* U+1fb00 - U+1fb0f */
|
/* U+1fb00 - U+1fb0f */
|
||||||
UPPER_LEFT,
|
UPPER_LEFT,
|
||||||
|
|
@ -2308,6 +2312,398 @@ draw_sextant(struct buf *buf, char32_t wc)
|
||||||
sextant_lower_right(buf);
|
sextant_lower_right(buf);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
octant_upper_left(struct buf *buf)
|
||||||
|
{
|
||||||
|
rect(0, 0, buf->x_halfs[0], buf->y_quads[0]);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
octant_middle_up_left(struct buf *buf)
|
||||||
|
{
|
||||||
|
rect(0, buf->y_quads[0], buf->x_halfs[0], buf->y_quads[1]);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
octant_middle_down_left(struct buf *buf)
|
||||||
|
{
|
||||||
|
rect(0, buf->y_quads[1], buf->x_halfs[0], buf->y_quads[2]);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
octant_lower_left(struct buf *buf)
|
||||||
|
{
|
||||||
|
rect(0, buf->y_quads[2], buf->x_halfs[0], buf->height);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
octant_upper_right(struct buf *buf)
|
||||||
|
{
|
||||||
|
rect(buf->x_halfs[1], 0, buf->width, buf->y_quads[0]);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
octant_middle_up_right(struct buf *buf)
|
||||||
|
{
|
||||||
|
rect(buf->x_halfs[1], buf->y_quads[0], buf->width, buf->y_quads[1]);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
octant_middle_down_right(struct buf *buf)
|
||||||
|
{
|
||||||
|
rect(buf->x_halfs[1], buf->y_quads[1], buf->width, buf->y_quads[2]);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
octant_lower_right(struct buf *buf)
|
||||||
|
{
|
||||||
|
rect(buf->x_halfs[1], buf->y_quads[2], buf->width, buf->height);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void NOINLINE
|
||||||
|
draw_octant(struct buf *buf, char32_t wc)
|
||||||
|
{
|
||||||
|
/*
|
||||||
|
* Each byte encodes one octant:
|
||||||
|
*
|
||||||
|
* Bit octant part
|
||||||
|
* 0 upper left
|
||||||
|
* 1 middle, upper left
|
||||||
|
* 2 middle, lower left
|
||||||
|
* 3 lower, left
|
||||||
|
* 4 upper right
|
||||||
|
* 5 middle, upper right
|
||||||
|
* 6 middle, lower right
|
||||||
|
* 7 lower right
|
||||||
|
*/
|
||||||
|
enum {
|
||||||
|
UPPER_LEFT = 1 << 0,
|
||||||
|
MIDDLE_UP_LEFT = 1 << 1,
|
||||||
|
MIDDLE_DOWN_LEFT = 1 << 2,
|
||||||
|
LOWER_LEFT = 1 << 3,
|
||||||
|
UPPER_RIGHT = 1 << 4,
|
||||||
|
MIDDLE_UP_RIGHT = 1 << 5,
|
||||||
|
MIDDLE_DOWN_RIGHT = 1 << 6,
|
||||||
|
LOWER_RIGHT = 1 << 7,
|
||||||
|
};
|
||||||
|
|
||||||
|
/* TODO: move this to a separate file */
|
||||||
|
static const uint8_t matrix[230] = {
|
||||||
|
/* U+1CD00 - U+1CD0F */
|
||||||
|
MIDDLE_UP_LEFT,
|
||||||
|
MIDDLE_UP_LEFT | UPPER_RIGHT,
|
||||||
|
UPPER_LEFT | MIDDLE_UP_LEFT | UPPER_RIGHT,
|
||||||
|
MIDDLE_UP_RIGHT,
|
||||||
|
UPPER_LEFT | MIDDLE_UP_RIGHT,
|
||||||
|
UPPER_LEFT | UPPER_RIGHT | MIDDLE_UP_RIGHT,
|
||||||
|
MIDDLE_UP_LEFT | MIDDLE_UP_RIGHT,
|
||||||
|
UPPER_LEFT | MIDDLE_UP_LEFT | MIDDLE_UP_RIGHT,
|
||||||
|
UPPER_RIGHT | MIDDLE_UP_LEFT | MIDDLE_UP_RIGHT,
|
||||||
|
MIDDLE_DOWN_LEFT,
|
||||||
|
UPPER_LEFT | MIDDLE_DOWN_LEFT,
|
||||||
|
UPPER_RIGHT | MIDDLE_DOWN_LEFT,
|
||||||
|
UPPER_LEFT | UPPER_RIGHT | MIDDLE_DOWN_LEFT,
|
||||||
|
UPPER_LEFT | MIDDLE_UP_LEFT | MIDDLE_DOWN_LEFT,
|
||||||
|
UPPER_RIGHT | MIDDLE_UP_LEFT | MIDDLE_DOWN_LEFT,
|
||||||
|
UPPER_LEFT | UPPER_RIGHT | MIDDLE_UP_LEFT | MIDDLE_DOWN_LEFT,
|
||||||
|
|
||||||
|
/* U+1CD10 - U+1CD1F */
|
||||||
|
MIDDLE_UP_RIGHT | MIDDLE_DOWN_LEFT,
|
||||||
|
UPPER_LEFT | MIDDLE_UP_RIGHT | MIDDLE_DOWN_LEFT,
|
||||||
|
UPPER_RIGHT | MIDDLE_UP_RIGHT | MIDDLE_DOWN_LEFT,
|
||||||
|
UPPER_LEFT | UPPER_RIGHT | MIDDLE_UP_RIGHT | MIDDLE_DOWN_LEFT,
|
||||||
|
MIDDLE_UP_LEFT | MIDDLE_UP_RIGHT | MIDDLE_DOWN_LEFT,
|
||||||
|
UPPER_LEFT | MIDDLE_UP_LEFT | MIDDLE_UP_RIGHT | MIDDLE_DOWN_LEFT,
|
||||||
|
UPPER_RIGHT | MIDDLE_UP_LEFT | MIDDLE_UP_RIGHT | MIDDLE_DOWN_LEFT,
|
||||||
|
UPPER_LEFT | UPPER_RIGHT | MIDDLE_UP_LEFT | MIDDLE_UP_RIGHT | MIDDLE_DOWN_LEFT,
|
||||||
|
MIDDLE_DOWN_RIGHT,
|
||||||
|
UPPER_LEFT | MIDDLE_DOWN_RIGHT,
|
||||||
|
UPPER_RIGHT | MIDDLE_DOWN_RIGHT,
|
||||||
|
UPPER_LEFT | UPPER_RIGHT | MIDDLE_DOWN_RIGHT,
|
||||||
|
MIDDLE_UP_LEFT | MIDDLE_DOWN_RIGHT,
|
||||||
|
UPPER_LEFT | MIDDLE_UP_LEFT | MIDDLE_DOWN_RIGHT,
|
||||||
|
UPPER_RIGHT | MIDDLE_UP_LEFT | MIDDLE_DOWN_RIGHT,
|
||||||
|
UPPER_LEFT | UPPER_RIGHT | MIDDLE_UP_LEFT | MIDDLE_DOWN_RIGHT,
|
||||||
|
|
||||||
|
/* U+1CD20 - U+1CD2F */
|
||||||
|
UPPER_LEFT | MIDDLE_UP_RIGHT | MIDDLE_DOWN_RIGHT,
|
||||||
|
UPPER_RIGHT | MIDDLE_UP_RIGHT | MIDDLE_DOWN_RIGHT,
|
||||||
|
UPPER_LEFT | UPPER_RIGHT | MIDDLE_UP_RIGHT | MIDDLE_DOWN_RIGHT,
|
||||||
|
MIDDLE_UP_LEFT | MIDDLE_UP_RIGHT | MIDDLE_DOWN_RIGHT,
|
||||||
|
UPPER_LEFT | MIDDLE_UP_LEFT | MIDDLE_UP_RIGHT | MIDDLE_DOWN_RIGHT,
|
||||||
|
UPPER_RIGHT | MIDDLE_UP_LEFT | MIDDLE_UP_RIGHT | MIDDLE_DOWN_RIGHT,
|
||||||
|
UPPER_LEFT | UPPER_RIGHT | MIDDLE_UP_LEFT | MIDDLE_UP_RIGHT | MIDDLE_DOWN_RIGHT,
|
||||||
|
MIDDLE_DOWN_LEFT | MIDDLE_DOWN_RIGHT,
|
||||||
|
UPPER_LEFT | MIDDLE_DOWN_LEFT | MIDDLE_DOWN_RIGHT,
|
||||||
|
UPPER_RIGHT | MIDDLE_DOWN_LEFT | MIDDLE_DOWN_RIGHT,
|
||||||
|
UPPER_LEFT | UPPER_RIGHT | MIDDLE_DOWN_LEFT | MIDDLE_DOWN_RIGHT,
|
||||||
|
MIDDLE_UP_LEFT | MIDDLE_DOWN_LEFT | MIDDLE_DOWN_RIGHT,
|
||||||
|
UPPER_LEFT | MIDDLE_UP_LEFT | MIDDLE_DOWN_LEFT | MIDDLE_DOWN_RIGHT,
|
||||||
|
UPPER_RIGHT | MIDDLE_UP_LEFT | MIDDLE_DOWN_LEFT | MIDDLE_DOWN_RIGHT,
|
||||||
|
UPPER_LEFT | UPPER_RIGHT | MIDDLE_UP_LEFT | MIDDLE_DOWN_LEFT | MIDDLE_DOWN_RIGHT,
|
||||||
|
MIDDLE_UP_RIGHT | MIDDLE_DOWN_LEFT | MIDDLE_DOWN_RIGHT,
|
||||||
|
|
||||||
|
/* U+1CD30 - U+1CD3F */
|
||||||
|
UPPER_LEFT | MIDDLE_UP_RIGHT | MIDDLE_DOWN_LEFT | MIDDLE_DOWN_RIGHT,
|
||||||
|
UPPER_RIGHT | MIDDLE_UP_RIGHT | MIDDLE_DOWN_LEFT | MIDDLE_DOWN_RIGHT,
|
||||||
|
UPPER_LEFT | UPPER_RIGHT | MIDDLE_UP_RIGHT | MIDDLE_DOWN_LEFT | MIDDLE_DOWN_RIGHT,
|
||||||
|
MIDDLE_UP_LEFT | MIDDLE_UP_RIGHT | MIDDLE_DOWN_LEFT | MIDDLE_DOWN_RIGHT,
|
||||||
|
UPPER_LEFT | MIDDLE_UP_LEFT | MIDDLE_UP_RIGHT | MIDDLE_DOWN_LEFT | MIDDLE_DOWN_RIGHT,
|
||||||
|
UPPER_RIGHT | MIDDLE_UP_LEFT | MIDDLE_UP_RIGHT | MIDDLE_DOWN_LEFT | MIDDLE_DOWN_RIGHT,
|
||||||
|
UPPER_LEFT | LOWER_LEFT,
|
||||||
|
UPPER_RIGHT | LOWER_LEFT,
|
||||||
|
UPPER_LEFT | UPPER_RIGHT | LOWER_LEFT,
|
||||||
|
MIDDLE_UP_LEFT | LOWER_LEFT,
|
||||||
|
UPPER_LEFT | MIDDLE_UP_LEFT | LOWER_LEFT,
|
||||||
|
UPPER_RIGHT | MIDDLE_UP_LEFT | LOWER_LEFT,
|
||||||
|
UPPER_LEFT | UPPER_RIGHT | MIDDLE_UP_LEFT | LOWER_LEFT,
|
||||||
|
MIDDLE_UP_RIGHT | LOWER_LEFT,
|
||||||
|
UPPER_LEFT | MIDDLE_UP_RIGHT | LOWER_LEFT,
|
||||||
|
UPPER_RIGHT | MIDDLE_UP_RIGHT | LOWER_LEFT,
|
||||||
|
|
||||||
|
/* U+1CD40 - U+1CD4F */
|
||||||
|
UPPER_LEFT | UPPER_RIGHT | MIDDLE_UP_RIGHT | LOWER_LEFT,
|
||||||
|
MIDDLE_UP_LEFT | MIDDLE_UP_RIGHT | LOWER_LEFT,
|
||||||
|
UPPER_LEFT | MIDDLE_UP_LEFT | MIDDLE_UP_RIGHT | LOWER_LEFT,
|
||||||
|
UPPER_RIGHT | MIDDLE_UP_LEFT | MIDDLE_UP_RIGHT | LOWER_LEFT,
|
||||||
|
UPPER_LEFT | UPPER_RIGHT | MIDDLE_UP_LEFT | MIDDLE_UP_RIGHT | LOWER_LEFT,
|
||||||
|
UPPER_LEFT | MIDDLE_DOWN_LEFT | LOWER_LEFT,
|
||||||
|
UPPER_RIGHT | MIDDLE_DOWN_LEFT | LOWER_LEFT,
|
||||||
|
UPPER_LEFT | UPPER_RIGHT | MIDDLE_DOWN_LEFT | LOWER_LEFT,
|
||||||
|
MIDDLE_UP_LEFT | MIDDLE_DOWN_LEFT | LOWER_LEFT,
|
||||||
|
UPPER_RIGHT | MIDDLE_UP_LEFT | MIDDLE_DOWN_LEFT | LOWER_LEFT,
|
||||||
|
UPPER_LEFT | UPPER_RIGHT | MIDDLE_UP_LEFT | MIDDLE_DOWN_LEFT | LOWER_LEFT,
|
||||||
|
MIDDLE_UP_RIGHT | MIDDLE_DOWN_LEFT | LOWER_LEFT,
|
||||||
|
UPPER_LEFT | MIDDLE_UP_RIGHT | MIDDLE_DOWN_LEFT | LOWER_LEFT,
|
||||||
|
UPPER_LEFT | UPPER_RIGHT | MIDDLE_UP_RIGHT | MIDDLE_DOWN_LEFT | LOWER_LEFT,
|
||||||
|
MIDDLE_UP_LEFT | MIDDLE_UP_RIGHT | MIDDLE_DOWN_LEFT | LOWER_LEFT,
|
||||||
|
UPPER_LEFT | MIDDLE_UP_LEFT | MIDDLE_UP_RIGHT | MIDDLE_DOWN_LEFT | LOWER_LEFT,
|
||||||
|
|
||||||
|
/* U+1CD50 - U+1CD5F */
|
||||||
|
UPPER_RIGHT | MIDDLE_UP_LEFT | MIDDLE_UP_RIGHT | MIDDLE_DOWN_LEFT | LOWER_LEFT,
|
||||||
|
MIDDLE_DOWN_RIGHT | LOWER_LEFT,
|
||||||
|
UPPER_LEFT | MIDDLE_DOWN_RIGHT | LOWER_LEFT,
|
||||||
|
UPPER_RIGHT | MIDDLE_DOWN_RIGHT | LOWER_LEFT,
|
||||||
|
UPPER_LEFT | UPPER_RIGHT | MIDDLE_DOWN_RIGHT | LOWER_LEFT,
|
||||||
|
MIDDLE_UP_LEFT | MIDDLE_DOWN_RIGHT | LOWER_LEFT,
|
||||||
|
UPPER_LEFT | MIDDLE_UP_LEFT | MIDDLE_DOWN_RIGHT | LOWER_LEFT,
|
||||||
|
UPPER_RIGHT | MIDDLE_UP_LEFT | MIDDLE_DOWN_RIGHT | LOWER_LEFT,
|
||||||
|
UPPER_LEFT | UPPER_RIGHT | MIDDLE_UP_LEFT | MIDDLE_DOWN_RIGHT | LOWER_LEFT,
|
||||||
|
MIDDLE_UP_RIGHT | MIDDLE_DOWN_RIGHT | LOWER_LEFT,
|
||||||
|
UPPER_LEFT | MIDDLE_UP_RIGHT | MIDDLE_DOWN_RIGHT | LOWER_LEFT,
|
||||||
|
UPPER_RIGHT | MIDDLE_UP_RIGHT | MIDDLE_DOWN_RIGHT | LOWER_LEFT,
|
||||||
|
UPPER_LEFT | UPPER_RIGHT | MIDDLE_UP_RIGHT | MIDDLE_DOWN_RIGHT | LOWER_LEFT,
|
||||||
|
MIDDLE_UP_LEFT | MIDDLE_UP_RIGHT | MIDDLE_DOWN_RIGHT | LOWER_LEFT,
|
||||||
|
UPPER_LEFT | MIDDLE_UP_LEFT | MIDDLE_UP_RIGHT | MIDDLE_DOWN_RIGHT | LOWER_LEFT,
|
||||||
|
UPPER_RIGHT | MIDDLE_UP_LEFT | MIDDLE_UP_RIGHT | MIDDLE_DOWN_RIGHT | LOWER_LEFT,
|
||||||
|
|
||||||
|
/* U+1CD60 - U+1CD6F */
|
||||||
|
UPPER_LEFT | UPPER_RIGHT | MIDDLE_UP_LEFT | MIDDLE_UP_RIGHT | MIDDLE_DOWN_RIGHT | LOWER_LEFT,
|
||||||
|
MIDDLE_DOWN_LEFT | MIDDLE_DOWN_RIGHT | LOWER_LEFT,
|
||||||
|
UPPER_LEFT | MIDDLE_DOWN_LEFT | MIDDLE_DOWN_RIGHT | LOWER_LEFT,
|
||||||
|
UPPER_RIGHT | MIDDLE_DOWN_LEFT | MIDDLE_DOWN_RIGHT | LOWER_LEFT,
|
||||||
|
UPPER_LEFT | UPPER_RIGHT | MIDDLE_DOWN_LEFT | MIDDLE_DOWN_RIGHT | LOWER_LEFT,
|
||||||
|
MIDDLE_UP_LEFT | MIDDLE_DOWN_LEFT | MIDDLE_DOWN_RIGHT | LOWER_LEFT,
|
||||||
|
UPPER_LEFT | MIDDLE_UP_LEFT | MIDDLE_DOWN_LEFT | MIDDLE_DOWN_RIGHT | LOWER_LEFT,
|
||||||
|
UPPER_RIGHT | MIDDLE_UP_LEFT | MIDDLE_DOWN_LEFT | MIDDLE_DOWN_RIGHT | LOWER_LEFT,
|
||||||
|
UPPER_LEFT | UPPER_RIGHT | MIDDLE_UP_LEFT | MIDDLE_DOWN_LEFT | MIDDLE_DOWN_RIGHT | LOWER_LEFT,
|
||||||
|
MIDDLE_UP_RIGHT | MIDDLE_DOWN_LEFT | MIDDLE_DOWN_RIGHT | LOWER_LEFT,
|
||||||
|
UPPER_LEFT | MIDDLE_UP_RIGHT | MIDDLE_DOWN_LEFT | MIDDLE_DOWN_RIGHT | LOWER_LEFT,
|
||||||
|
UPPER_RIGHT | MIDDLE_UP_RIGHT | MIDDLE_DOWN_LEFT | MIDDLE_DOWN_RIGHT | LOWER_LEFT,
|
||||||
|
UPPER_LEFT | UPPER_RIGHT | MIDDLE_UP_RIGHT | MIDDLE_DOWN_LEFT | MIDDLE_DOWN_RIGHT | LOWER_LEFT,
|
||||||
|
MIDDLE_UP_LEFT | MIDDLE_UP_RIGHT | MIDDLE_DOWN_LEFT | MIDDLE_DOWN_RIGHT | LOWER_LEFT,
|
||||||
|
UPPER_LEFT | MIDDLE_UP_LEFT | MIDDLE_UP_RIGHT | MIDDLE_DOWN_LEFT | MIDDLE_DOWN_RIGHT | LOWER_LEFT,
|
||||||
|
UPPER_RIGHT | MIDDLE_UP_LEFT | MIDDLE_UP_RIGHT | MIDDLE_DOWN_LEFT | MIDDLE_DOWN_RIGHT | LOWER_LEFT,
|
||||||
|
|
||||||
|
/* U+1CD70 - U+1CD7F */
|
||||||
|
UPPER_LEFT | UPPER_RIGHT | MIDDLE_UP_LEFT | MIDDLE_UP_RIGHT | MIDDLE_DOWN_LEFT | MIDDLE_DOWN_RIGHT | LOWER_LEFT,
|
||||||
|
UPPER_LEFT | LOWER_RIGHT,
|
||||||
|
UPPER_RIGHT | LOWER_RIGHT,
|
||||||
|
UPPER_LEFT | UPPER_RIGHT | LOWER_RIGHT,
|
||||||
|
MIDDLE_UP_LEFT | LOWER_RIGHT,
|
||||||
|
UPPER_LEFT | MIDDLE_UP_LEFT | LOWER_RIGHT,
|
||||||
|
UPPER_RIGHT | MIDDLE_UP_LEFT | LOWER_RIGHT,
|
||||||
|
UPPER_LEFT | UPPER_RIGHT | MIDDLE_UP_LEFT | LOWER_RIGHT,
|
||||||
|
MIDDLE_UP_RIGHT | LOWER_RIGHT,
|
||||||
|
UPPER_LEFT | MIDDLE_UP_RIGHT | LOWER_RIGHT,
|
||||||
|
UPPER_RIGHT | MIDDLE_UP_RIGHT | LOWER_RIGHT,
|
||||||
|
UPPER_LEFT | UPPER_RIGHT | MIDDLE_UP_RIGHT | LOWER_RIGHT,
|
||||||
|
MIDDLE_UP_LEFT | MIDDLE_UP_RIGHT | LOWER_RIGHT,
|
||||||
|
UPPER_LEFT | MIDDLE_UP_LEFT | MIDDLE_UP_RIGHT | LOWER_RIGHT,
|
||||||
|
UPPER_RIGHT | MIDDLE_UP_LEFT | MIDDLE_UP_RIGHT | LOWER_RIGHT,
|
||||||
|
UPPER_LEFT | UPPER_RIGHT | MIDDLE_UP_LEFT | MIDDLE_UP_RIGHT | LOWER_RIGHT,
|
||||||
|
|
||||||
|
/* U+1CD80 - U+1CD8F */
|
||||||
|
MIDDLE_DOWN_LEFT | LOWER_RIGHT,
|
||||||
|
UPPER_LEFT | MIDDLE_DOWN_LEFT | LOWER_RIGHT,
|
||||||
|
UPPER_RIGHT | MIDDLE_DOWN_LEFT | LOWER_RIGHT,
|
||||||
|
UPPER_LEFT | UPPER_RIGHT | MIDDLE_DOWN_LEFT | LOWER_RIGHT,
|
||||||
|
MIDDLE_UP_LEFT | MIDDLE_DOWN_LEFT | LOWER_RIGHT,
|
||||||
|
UPPER_LEFT | MIDDLE_UP_LEFT | MIDDLE_DOWN_LEFT | LOWER_RIGHT,
|
||||||
|
UPPER_RIGHT | MIDDLE_UP_LEFT | MIDDLE_DOWN_LEFT | LOWER_RIGHT,
|
||||||
|
UPPER_LEFT | UPPER_RIGHT | MIDDLE_UP_LEFT | MIDDLE_DOWN_LEFT | LOWER_RIGHT,
|
||||||
|
MIDDLE_UP_RIGHT | MIDDLE_DOWN_LEFT | LOWER_RIGHT,
|
||||||
|
UPPER_LEFT | MIDDLE_UP_RIGHT | MIDDLE_DOWN_LEFT | LOWER_RIGHT,
|
||||||
|
UPPER_RIGHT | MIDDLE_UP_RIGHT | MIDDLE_DOWN_LEFT | LOWER_RIGHT,
|
||||||
|
UPPER_LEFT | UPPER_RIGHT | MIDDLE_UP_RIGHT | MIDDLE_DOWN_LEFT | LOWER_RIGHT,
|
||||||
|
MIDDLE_UP_LEFT | MIDDLE_UP_RIGHT | MIDDLE_DOWN_LEFT | LOWER_RIGHT,
|
||||||
|
UPPER_LEFT | MIDDLE_UP_LEFT | MIDDLE_UP_RIGHT | MIDDLE_DOWN_LEFT | LOWER_RIGHT,
|
||||||
|
UPPER_RIGHT | MIDDLE_UP_LEFT | MIDDLE_UP_RIGHT | MIDDLE_DOWN_LEFT | LOWER_RIGHT,
|
||||||
|
UPPER_LEFT | UPPER_RIGHT | MIDDLE_UP_LEFT | MIDDLE_UP_RIGHT | MIDDLE_DOWN_LEFT | LOWER_RIGHT,
|
||||||
|
|
||||||
|
/* U+1CD90 - U+1CD9F */
|
||||||
|
UPPER_LEFT | MIDDLE_DOWN_RIGHT | LOWER_RIGHT,
|
||||||
|
UPPER_RIGHT | MIDDLE_DOWN_RIGHT | LOWER_RIGHT,
|
||||||
|
UPPER_LEFT | UPPER_RIGHT | MIDDLE_DOWN_RIGHT | LOWER_RIGHT,
|
||||||
|
MIDDLE_UP_LEFT | MIDDLE_DOWN_RIGHT | LOWER_RIGHT,
|
||||||
|
UPPER_RIGHT | MIDDLE_UP_LEFT | MIDDLE_DOWN_RIGHT | LOWER_RIGHT,
|
||||||
|
UPPER_LEFT | UPPER_RIGHT | MIDDLE_UP_LEFT | MIDDLE_DOWN_RIGHT | LOWER_RIGHT,
|
||||||
|
MIDDLE_UP_RIGHT | MIDDLE_DOWN_RIGHT | LOWER_RIGHT,
|
||||||
|
UPPER_LEFT | MIDDLE_UP_RIGHT | MIDDLE_DOWN_RIGHT | LOWER_RIGHT,
|
||||||
|
UPPER_LEFT | UPPER_RIGHT | MIDDLE_UP_RIGHT | MIDDLE_DOWN_RIGHT | LOWER_RIGHT,
|
||||||
|
MIDDLE_UP_LEFT | MIDDLE_UP_RIGHT | MIDDLE_DOWN_RIGHT | LOWER_RIGHT,
|
||||||
|
UPPER_LEFT | MIDDLE_UP_LEFT | MIDDLE_UP_RIGHT | MIDDLE_DOWN_RIGHT | LOWER_RIGHT,
|
||||||
|
UPPER_RIGHT | MIDDLE_UP_LEFT | MIDDLE_UP_RIGHT | MIDDLE_DOWN_RIGHT | LOWER_RIGHT,
|
||||||
|
MIDDLE_DOWN_LEFT | MIDDLE_DOWN_RIGHT | LOWER_RIGHT,
|
||||||
|
UPPER_LEFT | MIDDLE_DOWN_LEFT | MIDDLE_DOWN_RIGHT | LOWER_RIGHT,
|
||||||
|
UPPER_RIGHT | MIDDLE_DOWN_LEFT | MIDDLE_DOWN_RIGHT | LOWER_RIGHT,
|
||||||
|
UPPER_LEFT | UPPER_RIGHT | MIDDLE_DOWN_LEFT | MIDDLE_DOWN_RIGHT | LOWER_RIGHT,
|
||||||
|
|
||||||
|
/* U+1CDA0 - U+1CDAF */
|
||||||
|
MIDDLE_UP_LEFT | MIDDLE_DOWN_LEFT | MIDDLE_DOWN_RIGHT | LOWER_RIGHT,
|
||||||
|
UPPER_LEFT | MIDDLE_UP_LEFT | MIDDLE_DOWN_LEFT | MIDDLE_DOWN_RIGHT | LOWER_RIGHT,
|
||||||
|
UPPER_RIGHT | MIDDLE_UP_LEFT | MIDDLE_DOWN_LEFT | MIDDLE_DOWN_RIGHT | LOWER_RIGHT,
|
||||||
|
UPPER_LEFT | UPPER_RIGHT | MIDDLE_UP_LEFT | MIDDLE_DOWN_LEFT | MIDDLE_DOWN_RIGHT | LOWER_RIGHT,
|
||||||
|
MIDDLE_UP_RIGHT | MIDDLE_DOWN_LEFT | MIDDLE_DOWN_RIGHT | LOWER_RIGHT,
|
||||||
|
UPPER_LEFT | MIDDLE_UP_RIGHT | MIDDLE_DOWN_LEFT | MIDDLE_DOWN_RIGHT | LOWER_RIGHT,
|
||||||
|
UPPER_RIGHT | MIDDLE_UP_RIGHT | MIDDLE_DOWN_LEFT | MIDDLE_DOWN_RIGHT | LOWER_RIGHT,
|
||||||
|
UPPER_LEFT | UPPER_RIGHT | MIDDLE_UP_RIGHT | MIDDLE_DOWN_LEFT | MIDDLE_DOWN_RIGHT | LOWER_RIGHT,
|
||||||
|
MIDDLE_UP_LEFT | MIDDLE_UP_RIGHT | MIDDLE_DOWN_LEFT | MIDDLE_DOWN_RIGHT | LOWER_RIGHT,
|
||||||
|
UPPER_LEFT | MIDDLE_UP_LEFT | MIDDLE_UP_RIGHT | MIDDLE_DOWN_LEFT | MIDDLE_DOWN_RIGHT | LOWER_RIGHT,
|
||||||
|
UPPER_RIGHT | MIDDLE_UP_LEFT | MIDDLE_UP_RIGHT | MIDDLE_DOWN_LEFT | MIDDLE_DOWN_RIGHT | LOWER_RIGHT,
|
||||||
|
UPPER_LEFT | UPPER_RIGHT | MIDDLE_UP_LEFT | MIDDLE_UP_RIGHT | MIDDLE_DOWN_LEFT | MIDDLE_DOWN_RIGHT | LOWER_RIGHT,
|
||||||
|
UPPER_LEFT | LOWER_LEFT | LOWER_RIGHT,
|
||||||
|
UPPER_RIGHT | LOWER_LEFT | LOWER_RIGHT,
|
||||||
|
UPPER_LEFT | UPPER_RIGHT | LOWER_LEFT | LOWER_RIGHT,
|
||||||
|
MIDDLE_UP_LEFT | LOWER_LEFT | LOWER_RIGHT,
|
||||||
|
|
||||||
|
/* U+1CDB0 - U+1CDBF */
|
||||||
|
UPPER_LEFT | MIDDLE_UP_LEFT | LOWER_LEFT | LOWER_RIGHT,
|
||||||
|
UPPER_RIGHT | MIDDLE_UP_LEFT | LOWER_LEFT | LOWER_RIGHT,
|
||||||
|
UPPER_LEFT | UPPER_RIGHT | MIDDLE_UP_LEFT | LOWER_LEFT | LOWER_RIGHT,
|
||||||
|
MIDDLE_UP_RIGHT | LOWER_LEFT | LOWER_RIGHT,
|
||||||
|
UPPER_LEFT | MIDDLE_UP_RIGHT | LOWER_LEFT | LOWER_RIGHT,
|
||||||
|
UPPER_RIGHT | MIDDLE_UP_RIGHT | LOWER_LEFT | LOWER_RIGHT,
|
||||||
|
UPPER_LEFT | UPPER_RIGHT | MIDDLE_UP_RIGHT | LOWER_LEFT | LOWER_RIGHT,
|
||||||
|
MIDDLE_UP_LEFT | MIDDLE_UP_RIGHT | LOWER_LEFT | LOWER_RIGHT,
|
||||||
|
UPPER_LEFT | MIDDLE_UP_LEFT | MIDDLE_UP_RIGHT | LOWER_LEFT | LOWER_RIGHT,
|
||||||
|
UPPER_RIGHT | MIDDLE_UP_LEFT | MIDDLE_UP_RIGHT | LOWER_LEFT | LOWER_RIGHT,
|
||||||
|
UPPER_LEFT | UPPER_RIGHT | MIDDLE_UP_LEFT | MIDDLE_UP_RIGHT | LOWER_LEFT | LOWER_RIGHT,
|
||||||
|
MIDDLE_DOWN_LEFT | LOWER_LEFT | LOWER_RIGHT,
|
||||||
|
UPPER_LEFT | MIDDLE_DOWN_LEFT | LOWER_LEFT | LOWER_RIGHT,
|
||||||
|
UPPER_RIGHT | MIDDLE_DOWN_LEFT | LOWER_LEFT | LOWER_RIGHT,
|
||||||
|
UPPER_LEFT | UPPER_RIGHT | MIDDLE_DOWN_LEFT | LOWER_LEFT | LOWER_RIGHT,
|
||||||
|
MIDDLE_UP_LEFT | MIDDLE_DOWN_LEFT | LOWER_LEFT | LOWER_RIGHT,
|
||||||
|
|
||||||
|
/* U+1CDC0 - U+1CDCF */
|
||||||
|
UPPER_LEFT | MIDDLE_UP_LEFT | MIDDLE_DOWN_LEFT | LOWER_LEFT | LOWER_RIGHT,
|
||||||
|
UPPER_RIGHT | MIDDLE_UP_LEFT | MIDDLE_DOWN_LEFT | LOWER_LEFT | LOWER_RIGHT,
|
||||||
|
UPPER_LEFT | UPPER_RIGHT | MIDDLE_UP_LEFT | MIDDLE_DOWN_LEFT | LOWER_LEFT | LOWER_RIGHT,
|
||||||
|
MIDDLE_UP_RIGHT | MIDDLE_DOWN_LEFT | LOWER_LEFT | LOWER_RIGHT,
|
||||||
|
UPPER_LEFT | MIDDLE_UP_RIGHT | MIDDLE_DOWN_LEFT | LOWER_LEFT | LOWER_RIGHT,
|
||||||
|
UPPER_RIGHT | MIDDLE_UP_RIGHT | MIDDLE_DOWN_LEFT | LOWER_LEFT | LOWER_RIGHT,
|
||||||
|
UPPER_LEFT | UPPER_RIGHT | MIDDLE_UP_RIGHT | MIDDLE_DOWN_LEFT | LOWER_LEFT | LOWER_RIGHT,
|
||||||
|
MIDDLE_UP_LEFT | MIDDLE_UP_RIGHT | MIDDLE_DOWN_LEFT | LOWER_LEFT | LOWER_RIGHT,
|
||||||
|
UPPER_LEFT | MIDDLE_UP_LEFT | MIDDLE_UP_RIGHT | MIDDLE_DOWN_LEFT | LOWER_LEFT | LOWER_RIGHT,
|
||||||
|
UPPER_RIGHT | MIDDLE_UP_LEFT | MIDDLE_UP_RIGHT | MIDDLE_DOWN_LEFT | LOWER_LEFT | LOWER_RIGHT,
|
||||||
|
UPPER_LEFT | UPPER_RIGHT | MIDDLE_UP_LEFT | MIDDLE_UP_RIGHT | MIDDLE_DOWN_LEFT | LOWER_LEFT | LOWER_RIGHT,
|
||||||
|
MIDDLE_DOWN_RIGHT | LOWER_LEFT | LOWER_RIGHT,
|
||||||
|
UPPER_LEFT | MIDDLE_DOWN_RIGHT | LOWER_LEFT | LOWER_RIGHT,
|
||||||
|
UPPER_RIGHT | MIDDLE_DOWN_RIGHT | LOWER_LEFT | LOWER_RIGHT,
|
||||||
|
UPPER_LEFT | UPPER_RIGHT | MIDDLE_DOWN_RIGHT | LOWER_LEFT | LOWER_RIGHT,
|
||||||
|
MIDDLE_UP_LEFT | MIDDLE_DOWN_RIGHT | LOWER_LEFT | LOWER_RIGHT,
|
||||||
|
|
||||||
|
/* U+1CDD0 - U+1CDDF */
|
||||||
|
UPPER_LEFT | MIDDLE_UP_LEFT | MIDDLE_DOWN_RIGHT | LOWER_LEFT | LOWER_RIGHT,
|
||||||
|
UPPER_RIGHT | MIDDLE_UP_LEFT | MIDDLE_DOWN_RIGHT | LOWER_LEFT | LOWER_RIGHT,
|
||||||
|
UPPER_LEFT | UPPER_RIGHT | MIDDLE_UP_LEFT | MIDDLE_DOWN_RIGHT | LOWER_LEFT | LOWER_RIGHT,
|
||||||
|
MIDDLE_UP_RIGHT | MIDDLE_DOWN_RIGHT | LOWER_LEFT | LOWER_RIGHT,
|
||||||
|
UPPER_LEFT | MIDDLE_UP_RIGHT | MIDDLE_DOWN_RIGHT | LOWER_LEFT | LOWER_RIGHT,
|
||||||
|
UPPER_RIGHT | MIDDLE_UP_RIGHT | MIDDLE_DOWN_RIGHT | LOWER_LEFT | LOWER_RIGHT,
|
||||||
|
UPPER_LEFT | UPPER_RIGHT | MIDDLE_UP_RIGHT | MIDDLE_DOWN_RIGHT | LOWER_LEFT | LOWER_RIGHT,
|
||||||
|
MIDDLE_UP_LEFT | MIDDLE_UP_RIGHT | MIDDLE_DOWN_RIGHT | LOWER_LEFT | LOWER_RIGHT,
|
||||||
|
UPPER_LEFT | MIDDLE_UP_LEFT | MIDDLE_UP_RIGHT | MIDDLE_DOWN_RIGHT | LOWER_LEFT | LOWER_RIGHT,
|
||||||
|
UPPER_RIGHT | MIDDLE_UP_LEFT | MIDDLE_UP_RIGHT | MIDDLE_DOWN_RIGHT | LOWER_LEFT | LOWER_RIGHT,
|
||||||
|
UPPER_LEFT | UPPER_RIGHT | MIDDLE_UP_LEFT | MIDDLE_UP_RIGHT | MIDDLE_DOWN_RIGHT | LOWER_LEFT | LOWER_RIGHT,
|
||||||
|
UPPER_LEFT | MIDDLE_DOWN_LEFT | MIDDLE_DOWN_RIGHT | LOWER_LEFT | LOWER_RIGHT,
|
||||||
|
UPPER_RIGHT | MIDDLE_DOWN_LEFT | MIDDLE_DOWN_RIGHT | LOWER_LEFT | LOWER_RIGHT,
|
||||||
|
UPPER_LEFT | UPPER_RIGHT | MIDDLE_DOWN_LEFT | MIDDLE_DOWN_RIGHT | LOWER_LEFT | LOWER_RIGHT,
|
||||||
|
MIDDLE_UP_LEFT | MIDDLE_DOWN_LEFT | MIDDLE_DOWN_RIGHT | LOWER_LEFT | LOWER_RIGHT,
|
||||||
|
UPPER_RIGHT | MIDDLE_UP_LEFT | MIDDLE_DOWN_LEFT | MIDDLE_DOWN_RIGHT | LOWER_LEFT | LOWER_RIGHT,
|
||||||
|
|
||||||
|
/* U+1CDE0 - U+1CDE5 */
|
||||||
|
UPPER_LEFT | UPPER_RIGHT | MIDDLE_UP_LEFT | MIDDLE_DOWN_LEFT | MIDDLE_DOWN_RIGHT | LOWER_LEFT | LOWER_RIGHT,
|
||||||
|
MIDDLE_UP_RIGHT | MIDDLE_DOWN_LEFT | MIDDLE_DOWN_RIGHT | LOWER_LEFT | LOWER_RIGHT,
|
||||||
|
UPPER_LEFT | MIDDLE_UP_RIGHT | MIDDLE_DOWN_LEFT | MIDDLE_DOWN_RIGHT | LOWER_LEFT | LOWER_RIGHT,
|
||||||
|
UPPER_LEFT | UPPER_RIGHT | MIDDLE_UP_RIGHT | MIDDLE_DOWN_LEFT | MIDDLE_DOWN_RIGHT | LOWER_LEFT | LOWER_RIGHT,
|
||||||
|
UPPER_LEFT | MIDDLE_UP_LEFT | MIDDLE_UP_RIGHT | MIDDLE_DOWN_LEFT | MIDDLE_DOWN_RIGHT | LOWER_LEFT | LOWER_RIGHT,
|
||||||
|
UPPER_RIGHT | MIDDLE_UP_LEFT | MIDDLE_UP_RIGHT | MIDDLE_DOWN_LEFT | MIDDLE_DOWN_RIGHT | LOWER_LEFT | LOWER_RIGHT,
|
||||||
|
};
|
||||||
|
|
||||||
|
_Static_assert(ALEN(matrix) == 230, "incorrect number of codepoints");
|
||||||
|
|
||||||
|
#if defined(_DEBUG)
|
||||||
|
const size_t last_implemented = 0x1cde5;
|
||||||
|
for (size_t i = 0; i < sizeof(matrix) / sizeof(matrix[0]); i++) {
|
||||||
|
if (i + 0x1cd00 > last_implemented)
|
||||||
|
break;
|
||||||
|
|
||||||
|
for (size_t j = 0; j < sizeof(matrix) / sizeof(matrix[0]); j++) {
|
||||||
|
if (j + 0x1cd00 > last_implemented)
|
||||||
|
break;
|
||||||
|
|
||||||
|
if (i == j)
|
||||||
|
continue;
|
||||||
|
|
||||||
|
if (matrix[i] == matrix[j]) {
|
||||||
|
BUG("octant U+%05x (idx=%zu) is the same as U+%05x (idx=%zu)",
|
||||||
|
matrix[i], i, matrix[j], j);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
xassert(wc >= 0x1cd00 && wc <= 0x1cde5);
|
||||||
|
const size_t idx = wc - 0x1cd00;
|
||||||
|
|
||||||
|
xassert(idx < ALEN(matrix));
|
||||||
|
uint8_t encoded = matrix[idx];
|
||||||
|
|
||||||
|
if (encoded & UPPER_LEFT)
|
||||||
|
octant_upper_left(buf);
|
||||||
|
|
||||||
|
if (encoded & MIDDLE_UP_LEFT)
|
||||||
|
octant_middle_up_left(buf);
|
||||||
|
|
||||||
|
if (encoded & MIDDLE_DOWN_LEFT)
|
||||||
|
octant_middle_down_left(buf);
|
||||||
|
|
||||||
|
if (encoded & LOWER_LEFT)
|
||||||
|
octant_lower_left(buf);
|
||||||
|
|
||||||
|
if (encoded & UPPER_RIGHT)
|
||||||
|
octant_upper_right(buf);
|
||||||
|
|
||||||
|
if (encoded & MIDDLE_UP_RIGHT)
|
||||||
|
octant_middle_up_right(buf);
|
||||||
|
|
||||||
|
if (encoded & MIDDLE_DOWN_RIGHT)
|
||||||
|
octant_middle_down_right(buf);
|
||||||
|
|
||||||
|
if (encoded & LOWER_RIGHT)
|
||||||
|
octant_lower_right(buf);
|
||||||
|
}
|
||||||
|
|
||||||
static void NOINLINE
|
static void NOINLINE
|
||||||
draw_wedge_triangle(struct buf *buf, char32_t wc)
|
draw_wedge_triangle(struct buf *buf, char32_t wc)
|
||||||
{
|
{
|
||||||
|
|
@ -2856,6 +3252,7 @@ draw_glyph(struct buf *buf, char32_t wc)
|
||||||
|
|
||||||
case 0x2800 ... 0x28ff: draw_braille(buf, wc); break;
|
case 0x2800 ... 0x28ff: draw_braille(buf, wc); break;
|
||||||
|
|
||||||
|
case 0x1cd00 ... 0x1cde5: draw_octant(buf, wc); break;
|
||||||
case 0x1fb00 ... 0x1fb3b: draw_sextant(buf, wc); break;
|
case 0x1fb00 ... 0x1fb3b: draw_sextant(buf, wc); break;
|
||||||
|
|
||||||
case 0x1fb3c ... 0x1fb40:
|
case 0x1fb3c ... 0x1fb40:
|
||||||
|
|
@ -2957,24 +3354,51 @@ box_drawing(const struct terminal *term, char32_t wc)
|
||||||
(double)term->conf->tweak.box_drawing_base_thickness * scale * cell_size * dpi / 72.0;
|
(double)term->conf->tweak.box_drawing_base_thickness * scale * cell_size * dpi / 72.0;
|
||||||
base_thickness = max(base_thickness, 1);
|
base_thickness = max(base_thickness, 1);
|
||||||
|
|
||||||
int y0 = 0, y1 = 0;
|
int y_third_0 = 0, y_third_1 = 0;
|
||||||
switch (height % 3) {
|
switch (height % 3) {
|
||||||
case 0:
|
case 0:
|
||||||
y0 = height / 3;
|
y_third_0 = height / 3;
|
||||||
y1 = 2 * height / 3;
|
y_third_1 = 2 * height / 3;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 1:
|
case 1:
|
||||||
y0 = height / 3;
|
y_third_0 = height / 3;
|
||||||
y1 = 2 * height / 3 + 1;
|
y_third_1 = 2 * height / 3 + 1;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 2:
|
case 2:
|
||||||
y0 = height / 3 + 1;
|
y_third_0 = height / 3 + 1;
|
||||||
y1 = y0 + height / 3;
|
y_third_1 = y_third_0 + height / 3;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* TODO */
|
||||||
|
int y_quad_0 = 0, y_quad_1 = 0, y_quad_2 = 0;
|
||||||
|
switch (height % 4) {
|
||||||
|
case 0:
|
||||||
|
y_quad_0 = height / 4;
|
||||||
|
y_quad_1 = height / 2;
|
||||||
|
y_quad_2 = 3 * height / 4;
|
||||||
|
break;
|
||||||
|
|
||||||
|
case 1:
|
||||||
|
y_quad_0 = height / 4;
|
||||||
|
y_quad_1 = height / 2;
|
||||||
|
y_quad_2 = 3 * height / 4;
|
||||||
|
break;
|
||||||
|
case 2:
|
||||||
|
y_quad_0 = height / 4;
|
||||||
|
y_quad_1 = height / 2;
|
||||||
|
y_quad_2 = 3 * height / 4;
|
||||||
|
break;
|
||||||
|
|
||||||
|
case 3:
|
||||||
|
y_quad_0 = height / 4;
|
||||||
|
y_quad_1 = height / 2;
|
||||||
|
y_quad_2 = 3 * height / 4;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
struct buf buf = {
|
struct buf buf = {
|
||||||
.data = data,
|
.data = data,
|
||||||
.pix = pix,
|
.pix = pix,
|
||||||
|
|
@ -2996,8 +3420,14 @@ box_drawing(const struct terminal *term, char32_t wc)
|
||||||
},
|
},
|
||||||
|
|
||||||
.y_thirds = {
|
.y_thirds = {
|
||||||
y0, /* Endpoint first third, start point second third */
|
y_third_0, /* Endpoint first third, start point second third */
|
||||||
y1, /* Endpoint second third, start point last third */
|
y_third_1, /* Endpoint second third, start point last third */
|
||||||
|
},
|
||||||
|
|
||||||
|
.y_quads = {
|
||||||
|
y_quad_0,
|
||||||
|
y_quad_1,
|
||||||
|
y_quad_2,
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
||||||
16
render.c
16
render.c
|
|
@ -801,7 +801,15 @@ render_cell(struct terminal *term, pixman_image_t *pix, pixman_region32_t *damag
|
||||||
* Note, the full range is U+1FB00 - U+1FBF9
|
* Note, the full range is U+1FB00 - U+1FBF9
|
||||||
*/
|
*/
|
||||||
(base >= GLYPH_LEGACY_FIRST &&
|
(base >= GLYPH_LEGACY_FIRST &&
|
||||||
base <= GLYPH_LEGACY_LAST)) &&
|
base <= GLYPH_LEGACY_LAST) ||
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Unicode 16 "Symbols for Legacy Computing Supplement"
|
||||||
|
*
|
||||||
|
* Note, the full range is U+1CC00 - U+1CEAF
|
||||||
|
*/
|
||||||
|
(base >= GLYPH_OCTANTS_FIRST &&
|
||||||
|
base <= GLYPH_OCTANTS_LAST)) &&
|
||||||
|
|
||||||
likely(!term->conf->box_drawings_uses_font_glyphs))
|
likely(!term->conf->box_drawings_uses_font_glyphs))
|
||||||
{
|
{
|
||||||
|
|
@ -809,7 +817,11 @@ render_cell(struct terminal *term, pixman_image_t *pix, pixman_region32_t *damag
|
||||||
size_t count;
|
size_t count;
|
||||||
size_t idx;
|
size_t idx;
|
||||||
|
|
||||||
if (base >= GLYPH_LEGACY_FIRST) {
|
if (base >= GLYPH_OCTANTS_FIRST) {
|
||||||
|
arr = &term->custom_glyphs.octants;
|
||||||
|
count = GLYPH_OCTANTS_COUNT;
|
||||||
|
idx = base - GLYPH_OCTANTS_FIRST;
|
||||||
|
} else if (base >= GLYPH_LEGACY_FIRST) {
|
||||||
arr = &term->custom_glyphs.legacy;
|
arr = &term->custom_glyphs.legacy;
|
||||||
count = GLYPH_LEGACY_COUNT;
|
count = GLYPH_LEGACY_COUNT;
|
||||||
idx = base - GLYPH_LEGACY_FIRST;
|
idx = base - GLYPH_LEGACY_FIRST;
|
||||||
|
|
|
||||||
|
|
@ -808,6 +808,8 @@ term_set_fonts(struct terminal *term, struct fcft_font *fonts[static 4],
|
||||||
&term->custom_glyphs.braille, GLYPH_BRAILLE_COUNT);
|
&term->custom_glyphs.braille, GLYPH_BRAILLE_COUNT);
|
||||||
free_custom_glyphs(
|
free_custom_glyphs(
|
||||||
&term->custom_glyphs.legacy, GLYPH_LEGACY_COUNT);
|
&term->custom_glyphs.legacy, GLYPH_LEGACY_COUNT);
|
||||||
|
free_custom_glyphs(
|
||||||
|
&term->custom_glyphs.octants, GLYPH_OCTANTS_COUNT);
|
||||||
|
|
||||||
const struct config *conf = term->conf;
|
const struct config *conf = term->conf;
|
||||||
|
|
||||||
|
|
@ -1827,6 +1829,8 @@ term_destroy(struct terminal *term)
|
||||||
&term->custom_glyphs.braille, GLYPH_BRAILLE_COUNT);
|
&term->custom_glyphs.braille, GLYPH_BRAILLE_COUNT);
|
||||||
free_custom_glyphs(
|
free_custom_glyphs(
|
||||||
&term->custom_glyphs.legacy, GLYPH_LEGACY_COUNT);
|
&term->custom_glyphs.legacy, GLYPH_LEGACY_COUNT);
|
||||||
|
free_custom_glyphs(
|
||||||
|
&term->custom_glyphs.octants, GLYPH_OCTANTS_COUNT);
|
||||||
|
|
||||||
free(term->search.buf);
|
free(term->search.buf);
|
||||||
free(term->search.last.buf);
|
free(term->search.last.buf);
|
||||||
|
|
|
||||||
|
|
@ -483,6 +483,7 @@ struct terminal {
|
||||||
struct fcft_glyph **box_drawing;
|
struct fcft_glyph **box_drawing;
|
||||||
struct fcft_glyph **braille;
|
struct fcft_glyph **braille;
|
||||||
struct fcft_glyph **legacy;
|
struct fcft_glyph **legacy;
|
||||||
|
struct fcft_glyph **octants;
|
||||||
|
|
||||||
#define GLYPH_BOX_DRAWING_FIRST 0x2500
|
#define GLYPH_BOX_DRAWING_FIRST 0x2500
|
||||||
#define GLYPH_BOX_DRAWING_LAST 0x259F
|
#define GLYPH_BOX_DRAWING_LAST 0x259F
|
||||||
|
|
@ -498,6 +499,11 @@ struct terminal {
|
||||||
#define GLYPH_LEGACY_LAST 0x1FB9B
|
#define GLYPH_LEGACY_LAST 0x1FB9B
|
||||||
#define GLYPH_LEGACY_COUNT \
|
#define GLYPH_LEGACY_COUNT \
|
||||||
(GLYPH_LEGACY_LAST - GLYPH_LEGACY_FIRST + 1)
|
(GLYPH_LEGACY_LAST - GLYPH_LEGACY_FIRST + 1)
|
||||||
|
|
||||||
|
#define GLYPH_OCTANTS_FIRST 0x1CD00
|
||||||
|
#define GLYPH_OCTANTS_LAST 0x1CDE5
|
||||||
|
#define GLYPH_OCTANTS_COUNT \
|
||||||
|
(GLYPH_OCTANTS_LAST - GLYPH_OCTANTS_FIRST + 1)
|
||||||
} custom_glyphs;
|
} custom_glyphs;
|
||||||
|
|
||||||
bool is_sending_paste_data;
|
bool is_sending_paste_data;
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue