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

move_family_{below,above}() need return int #2232

Browse Source
This commit is contained in:
nick black 2021-10-04 13:41:14 -04:00
parent a2837a9754
commit 518eca2f60
No known key found for this signature in database
GPG Key ID: 5F43400C21CBFACC
4 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
USAGE.md
View File

@ -1121,11 +1121,11 @@ int ncplane_move_above(struct ncplane* RESTRICT n,
int ncplane_move_below(struct ncplane* RESTRICT n, int ncplane_move_below(struct ncplane* RESTRICT n,
struct ncplane* RESTRICT below); struct ncplane* RESTRICT below);
void ncplane_move_family_above(struct ncplane* RESTRICT n, int ncplane_move_family_above(struct ncplane* RESTRICT n,
struct ncplane* RESTRICT above); struct ncplane* RESTRICT above);
void ncplane_move_family_below(struct ncplane* RESTRICT n, int ncplane_move_family_below(struct ncplane* RESTRICT n,
struct ncplane* RESTRICT below); struct ncplane* RESTRICT below);
// Return the ncplane below this one, or NULL if this is at the stack's bottom. // Return the ncplane below this one, or NULL if this is at the stack's bottom.
struct ncplane* ncplane_below(struct ncplane* n); struct ncplane* ncplane_below(struct ncplane* n);

8
doc/man/man3/notcurses_plane.3.md
View File

@ -95,9 +95,9 @@ typedef struct ncplane_options {
**int ncplane_base(struct ncplane* ***ncp***, nccell* ***c***);** **int ncplane_base(struct ncplane* ***ncp***, nccell* ***c***);**
**int ncplane_move_top(struct ncplane* ***n***);** **void ncplane_move_top(struct ncplane* ***n***);**
**int ncplane_move_bottom(struct ncplane* ***n***);** **void ncplane_move_bottom(struct ncplane* ***n***);**
**void ncplane_move_family_top(struct ncplane* ***n***);** **void ncplane_move_family_top(struct ncplane* ***n***);**
@ -107,9 +107,9 @@ typedef struct ncplane_options {
**int ncplane_move_below(struct ncplane* restrict ***n***, struct ncplane* restrict ***targ***);** **int ncplane_move_below(struct ncplane* restrict ***n***, struct ncplane* restrict ***targ***);**
**void ncplane_move_family_above(struct ncplane* restrict ***n***, struct ncplane* restrict ***targ***);** **int ncplane_move_family_above(struct ncplane* restrict ***n***, struct ncplane* restrict ***targ***);**
**void ncplane_move_family_below(struct ncplane* restrict ***n***, struct ncplane* restrict ***targ***);** **int ncplane_move_family_below(struct ncplane* restrict ***n***, struct ncplane* restrict ***targ***);**
**struct ncplane* ncplane_below(struct ncplane* ***n***);** **struct ncplane* ncplane_below(struct ncplane* ***n***);**

4
include/notcurses/notcurses.h
View File

@ -1658,10 +1658,10 @@ API void ncplane_move_bottom(struct ncplane* n)
// reinserted planes. For a plane E bound to C, with z-ordering A B C D E, // reinserted planes. For a plane E bound to C, with z-ordering A B C D E,
// moving the C family to the top results in C E A B D, while moving it to // moving the C family to the top results in C E A B D, while moving it to
// the bottom results in A B D C E. // the bottom results in A B D C E.
API void ncplane_move_family_above(struct ncplane* n, struct ncplane* targ) API int ncplane_move_family_above(struct ncplane* n, struct ncplane* targ)
__attribute__ ((nonnull (1))); __attribute__ ((nonnull (1)));
API void ncplane_move_family_below(struct ncplane* n, struct ncplane* targ) API int ncplane_move_family_below(struct ncplane* n, struct ncplane* targ)
__attribute__ ((nonnull (1))); __attribute__ ((nonnull (1)));
__attribute__ ((nonnull (1))) __attribute__ ((nonnull (1)))

14
src/lib/notcurses.c
View File

@ -1453,10 +1453,12 @@ void ncplane_move_bottom(ncplane* n){
} }
// if above is NULL, we're moving to the bottom // if above is NULL, we're moving to the bottom
void ncplane_move_family_above(ncplane* restrict n, ncplane* restrict bpoint){ int ncplane_move_family_above(ncplane* restrict n, ncplane* restrict bpoint){
ncplane* above = ncplane_above(n); ncplane* above = ncplane_above(n);
ncplane* below = ncplane_below(n); ncplane* below = ncplane_below(n);
ncplane_move_above(n, bpoint); if(ncplane_move_above(n, bpoint)){
return -1;
}
// traverse the planes above n, until we hit NULL. do the planes above n // traverse the planes above n, until we hit NULL. do the planes above n
// first, so that we know the topmost element of our new ensplicification. // first, so that we know the topmost element of our new ensplicification.
// at this point, n is the bottommost plane, and we're inserting above it. // at this point, n is the bottommost plane, and we're inserting above it.
@ -1481,13 +1483,16 @@ void ncplane_move_family_above(ncplane* restrict n, ncplane* restrict bpoint){
} }
below = tmp; below = tmp;
} }
return 0;
} }
// if below is NULL, we're moving to the top // if below is NULL, we're moving to the top
void ncplane_move_family_below(ncplane* restrict n, ncplane* restrict bpoint){ int ncplane_move_family_below(ncplane* restrict n, ncplane* restrict bpoint){
ncplane* below = ncplane_below(n); ncplane* below = ncplane_below(n);
ncplane* above = ncplane_above(n); ncplane* above = ncplane_above(n);
ncplane_move_below(n, bpoint); if(ncplane_move_below(n, bpoint)){
return -1;
}
// traverse the planes below n, until we hit NULL. do the planes below n // traverse the planes below n, until we hit NULL. do the planes below n
// first, so that we know the bottommost element of our new ensplicification. // first, so that we know the bottommost element of our new ensplicification.
// we're inserting below n... // we're inserting below n...
@ -1512,6 +1517,7 @@ void ncplane_move_family_below(ncplane* restrict n, ncplane* restrict bpoint){
} }
above = tmp; above = tmp;
} }
return 0;
} }
void ncplane_cursor_yx(const ncplane* n, int* y, int* x){ void ncplane_cursor_yx(const ncplane* n, int* y, int* x){