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

tighten up CELL_BG_ALPHA_MASK

Browse Source
This commit is contained in:
nick black 2021-02-19 12:15:44 -05:00
parent 54c5675318
commit d845e979c2
No known key found for this signature in database
GPG Key ID: 5F43400C21CBFACC
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/notcurses/notcurses.h
View File

@ -104,8 +104,6 @@ API int ncstrwidth(const char* mbs);
API int notcurses_ucs32_to_utf8(const char32_t* ucs32, unsigned ucs32count,
unsigned char* resultbuf, size_t buflen);
// extract these bits to get a channel's alpha value
#define CHANNEL_ALPHA_MASK 0x30000000ull
// background cannot be highcontrast, only foreground
#define CELL_ALPHA_HIGHCONTRAST 0x30000000ull
#define CELL_ALPHA_TRANSPARENT 0x20000000ull
@ -128,7 +126,7 @@ API int notcurses_ucs32_to_utf8(const char32_t* ucs32, unsigned ucs32count,
// palette-indexed foreground color
#define CELL_FG_PALETTE (CELL_BG_PALETTE << 32u)
// extract these bits to get the background alpha mask
#define CELL_BG_ALPHA_MASK CHANNEL_ALPHA_MASK
#define CELL_BG_ALPHA_MASK 0x30000000ull
// extract these bits to get the foreground alpha mask
#define CELL_FG_ALPHA_MASK (CELL_BG_ALPHA_MASK << 32u)
@ -227,7 +225,7 @@ channel_set(unsigned* channel, unsigned rgb){
// Extract the 2-bit alpha component from a 32-bit channel.
static inline unsigned
channel_alpha(unsigned channel){
return channel & CHANNEL_ALPHA_MASK;
return channel & CELL_BG_ALPHA_MASK;
}
static inline unsigned
@ -238,10 +236,10 @@ channel_palindex(uint32_t channel){
// Set the 2-bit alpha component of the 32-bit channel.
static inline int
channel_set_alpha(unsigned* channel, unsigned alpha){
if(alpha & ~CHANNEL_ALPHA_MASK){
if(alpha & ~CELL_BG_ALPHA_MASK){
return -1;
}
*channel = alpha | (*channel & ~CHANNEL_ALPHA_MASK);
*channel = alpha | (*channel & ~CELL_BG_ALPHA_MASK);
if(alpha != CELL_ALPHA_OPAQUE){
*channel |= CELL_BGDEFAULT_MASK;
}