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

rewrite NCCHANNELS_INITIALIZER in terms of NCCHANNEL_INITIALIZER

Browse Source
This commit is contained in:
nick black 2021-08-13 14:14:33 -04:00
parent e35c49889d
commit c33ce4f9dd
No known key found for this signature in database
GPG Key ID: 5F43400C21CBFACC
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
doc/man/man3/notcurses_channels.3.md
View File

@ -11,12 +11,12 @@ notcurses_channels - operations on notcurses channels
**#include <notcurses/notcurses.h>** **#include <notcurses/notcurses.h>**
```c ```c
#define NCCHANNELS_INITIALIZER(fr, fg, fb, br, bg, bb) \ #define NCCHANNEL_INITIALIZER(r, g, b) \
(((((uint64_t)(fr) << 16u) + ((uint64_t)(fg) << 8u) + (uint64_t)(fb)) << 32ull) + \
(((br) << 16u) + ((bg) << 8u) + (bb)) + NC_BGDEFAULT_MASK + NC_FGDEFAULT_MASK)
#define CHANNEL_INITIALIZER(r, g, b) \
(((uint32_t)r << 16u) + ((uint32_t)g << 8u) + (b) + NC_BGDEFAULT_MASK) (((uint32_t)r << 16u) + ((uint32_t)g << 8u) + (b) + NC_BGDEFAULT_MASK)
#define NCCHANNELS_INITIALIZER(fr, fg, fb, br, bg, bb) \
((NCCHANNEL_INITIALIZER(fr, fg, fb) << 32ull) + \
(NCCHANNEL_INITIALIZER(br, bg, bb)))
``` ```
**uint32_t ncchannel_r(uint32_t ***channel***);** **uint32_t ncchannel_r(uint32_t ***channel***);**

11
include/notcurses/notcurses.h
View File

@ -140,14 +140,15 @@ API int notcurses_ucs32_to_utf8(const uint32_t* ucs32, unsigned ucs32count,
// extract these bits to get the foreground alpha mask // extract these bits to get the foreground alpha mask
#define NC_FG_ALPHA_MASK (NC_BG_ALPHA_MASK << 32u) #define NC_FG_ALPHA_MASK (NC_BG_ALPHA_MASK << 32u)
// initialize a 64-bit channel pair with specified RGB fg/bg // initialize a 32-bit channel pair with specified RGB
#define NCCHANNELS_INITIALIZER(fr, fg, fb, br, bg, bb) \
(((((uint64_t)(fr) << 16u) + ((uint64_t)(fg) << 8u) + (uint64_t)(fb)) << 32ull) + \
(((br) << 16u) + ((bg) << 8u) + (bb)) + NC_BGDEFAULT_MASK + NC_FGDEFAULT_MASK)
#define NCCHANNEL_INITIALIZER(r, g, b) \ #define NCCHANNEL_INITIALIZER(r, g, b) \
(((uint32_t)r << 16u) + ((uint32_t)g << 8u) + (b) + NC_BGDEFAULT_MASK) (((uint32_t)r << 16u) + ((uint32_t)g << 8u) + (b) + NC_BGDEFAULT_MASK)
// initialize a 64-bit channel pair with specified RGB fg/bg
#define NCCHANNELS_INITIALIZER(fr, fg, fb, br, bg, bb) \
((NCCHANNEL_INITIALIZER(fr, fg, fb) << 32ull) + \
(NCCHANNEL_INITIALIZER(br, bg, bb)))
// These lowest-level functions manipulate a 64-bit channel encoding directly. // These lowest-level functions manipulate a 64-bit channel encoding directly.
// Users will typically manipulate ncplane and nccell channels through those // Users will typically manipulate ncplane and nccell channels through those
// APIs, rather than calling these explicitly. // APIs, rather than calling these explicitly.