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

Merge branch 'master' of github.com:dankamongmen/notcurses into master

Browse Source
This commit is contained in:
nick black 2020-10-19 16:14:19 -04:00
commit 6b8ba110c4
No known key found for this signature in database
GPG Key ID: 5F43400C21CBFACC
4 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
doc/man/man3/notcurses_directmode.3.md
View File

@ -56,6 +56,8 @@ ncdirect_init - minimal notcurses instances for styling text
**int ncdirect_putstr(struct ncdirect* nc, uint64_t channels, const char* utf8);**
**int ncdirect_printf_aligned(struct ncdirect* n, int y, ncalign_e align, const char* fmt, ...);**
**bool ncdirect_canopen_images(const struct ncdirect* n);**
**bool ncdirect_canutf8(const struct ncdirect* n);**
@ -126,8 +128,8 @@ effect.
points to a valid **struct ncdirect**, which can be used until it is provided
to **ncdirect_stop**.
**ncdirect_putstr** returns the number of characters written on success. On
failure, it returns some negative number.
**ncdirect_putstr** and **ncdirect_printf_aligned** return the number of bytes
written on success. On failure, they return some negative number.
All other functions return 0 on success, and non-zero on error.

11
include/notcurses/direct.h
View File

@ -51,6 +51,12 @@ API unsigned ncdirect_palette_size(const struct ncdirect* nc);
// necessarily be immediately visible.
API int ncdirect_putstr(struct ncdirect* nc, uint64_t channels, const char* utf8);
// Formatted printing (plus alignment relative to the terminal). Returns the
// number of columns printed on success.
API int ncdirect_printf_aligned(struct ncdirect* n, int y, ncalign_e align,
const char* fmt, ...)
__attribute__ ((format (printf, 4, 5)));
// Force a flush. Returns 0 on success, -1 on failure.
API int ncdirect_flush(const struct ncdirect* nc);
@ -101,11 +107,6 @@ API int ncdirect_cursor_yx(struct ncdirect* n, int* y, int* x);
API int ncdirect_cursor_push(struct ncdirect* n);
API int ncdirect_cursor_pop(struct ncdirect* n);
// Formatted printing (plus alignment relative to the terminal).
API int ncdirect_printf_aligned(struct ncdirect* n, int y, ncalign_e align,
const char* fmt, ...)
__attribute__ ((format (printf, 4, 5)));
// Display an image using the specified blitter and scaling. The image may
// be arbitrarily many rows -- the output will scroll -- but will only occupy
// the column of the cursor, and those to the right.

1
python/src/notcurses/build_notcurses.py
View File

@ -417,6 +417,7 @@ int ncdirect_bg_rgb8(struct ncdirect* n, unsigned r, unsigned g, unsigned b);
int ncdirect_fg_rgb8(struct ncdirect* n, unsigned r, unsigned g, unsigned b);
unsigned ncdirect_palette_size(const struct ncdirect* nc);
int ncdirect_putstr(struct ncdirect* nc, uint64_t channels, const char* utf8);
int ncdirect_printf_aligned(struct ncdirect* n, int y, ncalign_e align, const char* fmt, ...);
int ncdirect_fg_rgb(struct ncdirect* n, unsigned rgb);
int ncdirect_bg_rgb(struct ncdirect* n, unsigned rgb);
int ncdirect_styles_set(struct ncdirect* n, unsigned stylebits);

2
src/lib/direct.cpp
View File

@ -491,7 +491,7 @@ int ncdirect_vprintf_aligned(ncdirect* n, int y, ncalign_e align, const char* fm
if(r == nullptr){
return -1;
}
const size_t len = strlen(r);
const size_t len = ncstrwidth(r);
const int x = ncdirect_align(n, align, len);
if(ncdirect_cursor_move_yx(n, y, x)){
free(r);