hide cell_{b,f}channel(), cell_set_{b,f}channel()

This commit is contained in:
nick black 2021-02-27 16:57:54 -05:00 committed by Nick Black
parent 53c52e30ff
commit 100a89291b
4 changed files with 28 additions and 32 deletions

View File

@ -12,6 +12,10 @@ rearrangements of Notcurses.
`ncdirect_check_pixel_support()`, which must be called (and must return
success) before `NCBLIT_PIXEL` will be available. `NCBLIT_PIXEL` degrades
to `NCBLIT_3x2` until support is verified.
* Ceased exporting `cell_fchannel()`, `cell_bchannel()`,
`cell_set_fchannel()`, and `cell_set_bchannel()`. These functions were
never safe for users. Everything a user might want to manipulate can be
manipulated with more granular functions.
* 2.2.2 (2021-02-18):
* `notcurses_stats()` no longer qualifies its `notcurses*` argument with

View File

@ -43,14 +43,6 @@ notcurses_channels - operations on notcurses channels
**uint32_t channel_set_default(uint32_t* ***channel***);**
**unsigned channels_bchannel(uint64_t ***channels***);**
**unsigned channels_fchannel(uint64_t ***channels***);**
**uint64_t channels_set_bchannel(uint64_t* ***channels***, uint32_t ***channel***);**
**uint64_t channels_set_fchannel(uint64_t* ***channels***, uint32_t ***channel***);**
**unsigned channels_fg_rgb(uint64_t ***channels***);**
**unsigned channels_bg_rgb(uint64_t ***channels***);**

View File

@ -1924,30 +1924,6 @@ API int ncplane_mergedown(const struct ncplane* RESTRICT src,
// The cursor is homed. The plane's active attributes are unaffected.
API void ncplane_erase(struct ncplane* n);
// Extract the 32-bit background channel from a cell.
static inline uint32_t
cell_bchannel(const nccell* cl){
return channels_bchannel(cl->channels);
}
// Extract the 32-bit foreground channel from a cell.
static inline uint32_t
cell_fchannel(const nccell* cl){
return channels_fchannel(cl->channels);
}
// Set the 32-bit background channel of an nccell.
static inline uint64_t
cell_set_bchannel(nccell* cl, uint32_t channel){
return channels_set_bchannel(&cl->channels, channel);
}
// Set the 32-bit foreground channel of an nccell.
static inline uint64_t
cell_set_fchannel(nccell* cl, uint32_t channel){
return channels_set_fchannel(&cl->channels, channel);
}
// Extract 24 bits of foreground RGB from 'cl', shifted to LSBs.
static inline uint32_t
cell_fg_rgb(const nccell* cl){

View File

@ -945,6 +945,30 @@ cell_set_blitquadrants(nccell* c, unsigned tl, unsigned tr, unsigned bl, unsigne
// Destroy a plane and all its bound descendants.
int ncplane_genocide(ncplane *ncp);
// Extract the 32-bit background channel from a cell.
static inline uint32_t
cell_bchannel(const nccell* cl){
return channels_bchannel(cl->channels);
}
// Extract the 32-bit foreground channel from a cell.
static inline uint32_t
cell_fchannel(const nccell* cl){
return channels_fchannel(cl->channels);
}
// Set the 32-bit background channel of an nccell.
static inline uint64_t
cell_set_bchannel(nccell* cl, uint32_t channel){
return channels_set_bchannel(&cl->channels, channel);
}
// Set the 32-bit foreground channel of an nccell.
static inline uint64_t
cell_set_fchannel(nccell* cl, uint32_t channel){
return channels_set_fchannel(&cl->channels, channel);
}
// Returns the result of blending two channels. 'blends' indicates how heavily
// 'c1' ought be weighed. If 'blends' is 0, 'c1' will be entirely replaced by
// 'c2'. If 'c1' is otherwise the default color, 'c1' will not be touched,