Archives/notcurses
2
0
Fork 0
mirror of https://github.com/dankamongmen/notcurses.git synced 2024-10-31 15:20:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

introduce ntole() #906

Browse Source
This commit is contained in:
nick black 2020-08-27 06:59:11 -04:00
parent c66d8f52d5
commit c24ca8ab56
No known key found for this signature in database
GPG Key ID: 5F43400C21CBFACC
2 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/notcurses/notcurses.h
View File

@ -13,6 +13,7 @@
#include <signal.h>
#include <limits.h>
#include <stdbool.h>
#include <byteswap.h>
#include <netinet/in.h>
#include <notcurses/nckeys.h>
@ -580,9 +581,10 @@ typedef struct cell {
uint64_t channels; // + 8B == 16B
} cell;
#define ntole(x) (bswap_32(htonl(x)))
#define CELL_TRIVIAL_INITIALIZER { }
#define CELL_SIMPLE_INITIALIZER(c) { .gcluster = (htonl(c)), .gcluster_backstop = 0, .reserved = 0, .stylemask = 0, .channels = 0, }
#define CELL_INITIALIZER(c, s, chan) { .gcluster = (htonl(c)), .gcluster_backstop = 0, .reserved = 0, .stylemask = (s), .channels = (chan), }
#define CELL_SIMPLE_INITIALIZER(c) { .gcluster = (ntole(c)), .gcluster_backstop = 0, .reserved = 0, .stylemask = 0, .channels = 0, }
#define CELL_INITIALIZER(c, s, chan) { .gcluster = (ntole(c)), .gcluster_backstop = 0, .reserved = 0, .stylemask = (s), .channels = (chan), }
static inline void
cell_init(cell* c){

22
tests/wide.cpp
View File

@ -108,13 +108,13 @@ TEST_CASE("Wide") {
ncplane_at_yx_cell(n_, 0, 1, &c);
CHECK(mbswidth(FROG) == 1 + cell_double_wide_p(&c)); // should be wide
ncplane_at_yx_cell(n_, 0, 2, &c);
CHECK(0 == c.gcluster); // should be nothing
CHECK(0 == strlen(cell_extended_gcluster(n_, &c))); // should be nothing
ncplane_at_yx_cell(n_, 1, 0, &c);
CHECK(0 == strcmp(cell_extended_gcluster(n_, &c), FROG));
ncplane_at_yx_cell(n_, 1, 1, &c);
CHECK(mbswidth(FROG) == 1 + cell_double_wide_p(&c)); //should be wide
ncplane_at_yx_cell(n_, 0, 2, &c);
CHECK(0 == c.gcluster);
CHECK(0 == strlen(cell_extended_gcluster(n_, &c)));
CHECK(0 == notcurses_render(nc_)); // should be nothing
}
@ -147,14 +147,14 @@ TEST_CASE("Wide") {
// Placing a normal char on either half of a wide char ought obliterate
// the original wide char.
SUBCASE("WideCharsAnnihilated") {
const char cc = 'X';
const char* cc = "X";
const char* wbashedl = SNAKE;
const char* wbashedr = SCORPION;
int sbytes = 0;
CHECK(0 < ncplane_putegc_yx(n_, 0, 0, wbashedl, &sbytes));
CHECK(0 < ncplane_putegc_yx(n_, 0, 2, wbashedr, &sbytes));
CHECK(1 == ncplane_putsimple_yx(n_, 0, 1, cc));
CHECK(1 == ncplane_putsimple_yx(n_, 0, 2, cc));
CHECK(1 == ncplane_putsimple_yx(n_, 0, 1, *cc));
CHECK(1 == ncplane_putsimple_yx(n_, 0, 2, *cc));
int x, y;
ncplane_cursor_yx(n_, &y, &x);
CHECK(0 == y);
@ -165,12 +165,12 @@ TEST_CASE("Wide") {
CHECK(0 == c.gcluster); // should be nothing
}
ncplane_at_yx_cell(n_, 0, 1, &c);
CHECK(cc == c.gcluster); // should be 'X'
CHECK(0 == strcmp(cc, cell_extended_gcluster(n_, &c))); // should be 'X'
ncplane_at_yx_cell(n_, 0, 2, &c);
CHECK(cc == c.gcluster); // should be 'X'
CHECK(0 == strcmp(cc, cell_extended_gcluster(n_, &c))); // should be 'X'
ncplane_at_yx_cell(n_, 0, 3, &c);
if(mbswidth(wbashedr) > 1){
CHECK(0 == c.gcluster); // should be nothing
CHECK(0 == strlen(cell_extended_gcluster(n_, &c))); // should be nothing
}
CHECK(0 == notcurses_render(nc_));
}
@ -178,13 +178,13 @@ TEST_CASE("Wide") {
// But placing something to the immediate right of any glyph, that is not a
// problem. Ensure it is so.
SUBCASE("AdjacentCharsSafe") {
const char cc = 'X';
const char* cc = "X";
const char* wsafel = SNAKE;
const char* wsafer = SCORPION;
int sbytes = 0;
CHECK(0 < ncplane_putegc_yx(n_, 0, 0, wsafel, &sbytes));
CHECK(0 < ncplane_putegc_yx(n_, 0, 3, wsafer, &sbytes));
CHECK(1 == ncplane_putsimple_yx(n_, 0, 2, cc));
CHECK(1 == ncplane_putsimple_yx(n_, 0, 2, *cc));
int x, y;
ncplane_cursor_yx(n_, &y, &x);
CHECK(0 == y);
@ -195,7 +195,7 @@ TEST_CASE("Wide") {
ncplane_at_yx_cell(n_, 0, 1, &c);
CHECK(mbswidth(SNAKE) == 1 + cell_double_wide_p(&c));
ncplane_at_yx_cell(n_, 0, 2, &c);
CHECK(cc == c.gcluster); // should be 'X'
CHECK(0 == strcmp(cc, cell_extended_gcluster(n_, &c))); // should be 'X'
ncplane_at_yx_cell(n_, 0, 3, &c);
CHECK(0 == strcmp(cell_extended_gcluster(n_, &c), SCORPION));
ncplane_at_yx_cell(n_, 0, 4, &c);