Archives/notcurses
2
0
Fork 0
mirror of https://github.com/dankamongmen/notcurses.git synced 2024-11-02 09:40:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

ncdirect_render_image: accept ncalign_e parameter #759

Browse Source
This commit is contained in:
nick black 2020-07-03 19:38:53 -04:00 committed by Nick Black
parent 46d75c072a
commit b829398538
6 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/ncpp/Direct.hh
View File

@ -122,9 +122,9 @@ namespace ncpp
return error_guard (ncdirect_cursor_disable (direct), -1); return error_guard (ncdirect_cursor_disable (direct), -1);
} }
nc_err_e render_image (const char* file, ncblitter_e blitter, ncscale_e scale) const noexcept nc_err_e render_image (const char* file, ncalign_e align, ncblitter_e blitter, ncscale_e scale) const noexcept
{ {
return ncdirect_render_image (direct, file, blitter, scale); return ncdirect_render_image (direct, file, align, blitter, scale);
} }
private: private:

3
include/notcurses/notcurses.h
View File

@ -154,7 +154,8 @@ API int ncdirect_printf_aligned(struct ncdirect* n, int y, ncalign_e align,
// // be arbitrarily many rows -- the output will scroll -- but will only occupy // // be arbitrarily many rows -- the output will scroll -- but will only occupy
// // the column of the cursor, and those to the right. // // the column of the cursor, and those to the right.
API nc_err_e ncdirect_render_image(struct ncdirect* n, const char* filename, API nc_err_e ncdirect_render_image(struct ncdirect* n, const char* filename,
ncblitter_e blitter, ncscale_e scale); ncalign_e align, ncblitter_e blitter,
ncscale_e scale);
// Clear the screen. // Clear the screen.
API int ncdirect_clear(struct ncdirect* nc); API int ncdirect_clear(struct ncdirect* nc);

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

@ -506,7 +506,7 @@ int ncdirect_cursor_up(struct ncdirect* nc, int num);
int ncdirect_cursor_left(struct ncdirect* nc, int num); int ncdirect_cursor_left(struct ncdirect* nc, int num);
int ncdirect_cursor_right(struct ncdirect* nc, int num); int ncdirect_cursor_right(struct ncdirect* nc, int num);
int ncdirect_cursor_down(struct ncdirect* nc, int num); int ncdirect_cursor_down(struct ncdirect* nc, int num);
nc_err_e ncdirect_render_image(struct ncdirect* n, const char* filename, ncblitter_e blitter, ncscale_e scale); nc_err_e ncdirect_render_image(struct ncdirect* n, const char* filename, ncalign_e align, ncblitter_e blitter, ncscale_e scale);
""") """)
if __name__ == "__main__": if __name__ == "__main__":

3
src/fetch/main.c
View File

@ -405,7 +405,8 @@ display_thread(void* vmarshal){
drawpalette(m->nc); drawpalette(m->nc);
if(m->dinfo){ if(m->dinfo){
if(m->dinfo->logofile){ if(m->dinfo->logofile){
if(ncdirect_render_image(m->nc, m->dinfo->logofile, NCBLIT_2x2, if(ncdirect_render_image(m->nc, m->dinfo->logofile,
NCALIGN_CENTER, NCBLIT_2x2,
NCSCALE_SCALE) != NCERR_SUCCESS){ NCSCALE_SCALE) != NCERR_SUCCESS){
return NULL; return NULL;
} }

3
src/lib/direct.cpp
View File

@ -282,7 +282,8 @@ ncdirect_dump_plane(ncdirect* n, const ncplane* np){
return 0; return 0;
} }
nc_err_e ncdirect_render_image(ncdirect* n, const char* file, ncblitter_e blitter, ncscale_e scale){ nc_err_e ncdirect_render_image(ncdirect* n, const char* file, ncalign_e align,
ncblitter_e blitter, ncscale_e scale){
nc_err_e ret; nc_err_e ret;
struct ncvisual* ncv = ncvisual_from_file(file, &ret); struct ncvisual* ncv = ncvisual_from_file(file, &ret);
if(ncv == NULL){ if(ncv == NULL){

9
src/poc/vizdirect.c
View File

@ -12,15 +12,18 @@ int main(void){
if((n = ncdirect_init(NULL, stdout)) == NULL){ if((n = ncdirect_init(NULL, stdout)) == NULL){
return EXIT_FAILURE; return EXIT_FAILURE;
} }
if(ncdirect_render_image(n, "../data/normal.png", NCBLIT_DEFAULT, NCSCALE_STRETCH) != NCERR_SUCCESS){ if(ncdirect_render_image(n, "../data/normal.png", NCALIGN_LEFT,
NCBLIT_DEFAULT, NCSCALE_STRETCH) != NCERR_SUCCESS){
return EXIT_FAILURE; return EXIT_FAILURE;
} }
sleep(1); sleep(1);
if(ncdirect_render_image(n, "../data/changes.jpg", NCBLIT_DEFAULT, NCSCALE_SCALE) != NCERR_SUCCESS){ if(ncdirect_render_image(n, "../data/changes.jpg", NCALIGN_CENTER,
NCBLIT_DEFAULT, NCSCALE_SCALE) != NCERR_SUCCESS){
return EXIT_FAILURE; return EXIT_FAILURE;
} }
sleep(1); sleep(1);
if(ncdirect_render_image(n, "../data/warmech.bmp", NCBLIT_DEFAULT, NCSCALE_NONE) != NCERR_SUCCESS){ if(ncdirect_render_image(n, "../data/warmech.bmp", NCALIGN_RIGHT,
NCBLIT_DEFAULT, NCSCALE_NONE) != NCERR_SUCCESS){
return EXIT_FAILURE; return EXIT_FAILURE;
} }
if(ncdirect_stop(n)){ if(ncdirect_stop(n)){