blackbeard420/notcurses
1
0
Fork 0
mirror of https://github.com/dankamongmen/notcurses synced 2025-03-09 17:19:03 -04:00
Code Issues Projects Releases Wiki Activity

add simple_box() and heavy_box() forms

Browse Source
This commit is contained in:
nick black 2021-06-10 17:04:29 -04:00
parent 4731e8269f
commit cb178ac247
No known key found for this signature in database
GPG Key ID: 5F43400C21CBFACC
4 changed files with 41 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
NEWS.md
View File

@ -21,6 +21,9 @@ rearrangements of Notcurses.
* A new binary is installed, `notcurses-info`. It prints information about
the terminal environment in which it runs. More information is available
from its man page, `notcurses-info(1)`.
* Added `ncdirect_simple_box()`, `ncdirect_heavy_box()`,
`nccells_simple_box()`, and `nccells_heavy_box()`. Publicized
`nccells_ascii_box()`. All are `static inline`.
* 2.3.2 (2021-06-03)
* Fixed a bug affecting certain scalings of `ncvisual` objects created from

14
include/notcurses/direct.h
View File

@ -271,6 +271,20 @@ API int ncdirect_box(struct ncdirect* n, uint64_t ul, uint64_t ur,
int ylen, int xlen, unsigned ctlword)
__attribute__ ((nonnull (1)));
__attribute__ ((nonnull (1))) static inline int
ncdirect_simple_box(struct ncdirect* n, uint64_t ul, uint64_t ur,
uint64_t ll, uint64_t lr,
int ylen, int xlen, unsigned ctlword){
return ncdirect_box(n, ul, ur, ll, lr, L"┌┐└┘─│", ylen, xlen, ctlword);
}
__attribute__ ((nonnull (1))) static inline int
ncdirect_heavy_box(struct ncdirect* n, uint64_t ul, uint64_t ur,
uint64_t ll, uint64_t lr,
int ylen, int xlen, unsigned ctlword){
return ncdirect_box(n, ul, ur, ll, lr, L"┏┓┗┛━┃", ylen, xlen, ctlword);
}
// ncdirect_box() with the rounded box-drawing characters
API int ncdirect_rounded_box(struct ncdirect* n, uint64_t ul, uint64_t ur,
uint64_t ll, uint64_t lr,

24
include/notcurses/notcurses.h
View File

@ -2313,6 +2313,30 @@ API int nccells_rounded_box(struct ncplane* n, uint32_t styles, uint64_t channel
nccell* ul, nccell* ur, nccell* ll,
nccell* lr, nccell* hl, nccell* vl);
static inline int
nccells_ascii_box(struct ncplane* n, uint32_t attr, uint64_t channels,
nccell* ul, nccell* ur, nccell* ll, nccell* lr, nccell* hl, nccell* vl){
return nccells_load_box(n, attr, channels, ul, ur, ll, lr, hl, vl, "/\\\\/-|");
}
static inline int
nccells_simple_box(struct ncplane* n, uint32_t attr, uint64_t channels,
nccell* ul, nccell* ur, nccell* ll, nccell* lr, nccell* hl, nccell* vl){
if(notcurses_canutf8(ncplane_notcurses(n))){
return nccells_load_box(n, attr, channels, ul, ur, ll, lr, hl, vl, "┌┐└┘─│");
}
return nccells_ascii_box(n, attr, channels, ul, ur, ll, lr, hl, vl);
}
static inline int
nccells_heavy_box(struct ncplane* n, uint32_t attr, uint64_t channels,
nccell* ul, nccell* ur, nccell* ll, nccell* lr, nccell* hl, nccell* vl){
if(notcurses_canutf8(ncplane_notcurses(n))){
return nccells_load_box(n, attr, channels, ul, ur, ll, lr, hl, vl, "┏┓┗┛━┃");
}
return nccells_ascii_box(n, attr, channels, ul, ur, ll, lr, hl, vl);
}
static inline int
ncplane_rounded_box(struct ncplane* n, uint32_t styles, uint64_t channels,
int ystop, int xstop, unsigned ctlword){

10
src/lib/notcurses.c
View File

@ -2821,16 +2821,6 @@ char* ncplane_contents(ncplane* nc, int begy, int begx, int leny, int lenx){
return ret;
}
int nccells_ascii_box(ncplane* n, uint32_t attr, uint64_t channels,
nccell* ul, nccell* ur, nccell* ll, nccell* lr, nccell* hl, nccell* vl){
return nccells_load_box(n, attr, channels, ul, ur, ll, lr, hl, vl, "/\\\\/-|");
}
int cells_ascii_box(ncplane* n, uint32_t attr, uint64_t channels,
nccell* ul, nccell* ur, nccell* ll, nccell* lr, nccell* hl, nccell* vl){
return nccells_ascii_box(n, attr, channels, ul, ur, ll, lr, hl, vl);
}
int nccells_double_box(ncplane* n, uint32_t attr, uint64_t channels,
nccell* ul, nccell* ur, nccell* ll, nccell* lr, nccell* hl, nccell* vl){
if(notcurses_canutf8(ncplane_notcurses(n))){