rename crs_* types to ct_*
This commit is contained in:
parent
2d76f8221e
commit
1dd5dd79c8
6 changed files with 75 additions and 75 deletions
|
|
@ -5,35 +5,35 @@
|
|||
#include "ncrswrap.h"
|
||||
#include "node.h"
|
||||
|
||||
/* Internal allocator method for crs_node structures.
|
||||
/* Internal allocator method for ct_node structures.
|
||||
*/
|
||||
static inline struct crs_node *__alloc_node(const enum crs_nodetype type) {
|
||||
struct crs_node *node = (struct crs_node *)malloc(sizeof(struct crs_node));
|
||||
static inline struct ct_node *__alloc_node(const enum ct_nodetype type) {
|
||||
struct ct_node *node = (struct ct_node *)malloc(sizeof(struct ct_node));
|
||||
node->type = type;
|
||||
return node;
|
||||
}
|
||||
|
||||
/* Construct a new window node (crs_node of type NODE_WIN).
|
||||
/* Construct a new window node (ct_node of type NODE_WIN).
|
||||
*/
|
||||
struct crs_node *init_window_node(WINDOW *const win) {
|
||||
struct crs_node *node = __alloc_node(NODE_WINDOW);
|
||||
struct ct_node *init_window_node(WINDOW *const win) {
|
||||
struct ct_node *node = __alloc_node(NODE_WINDOW);
|
||||
node->win = win;
|
||||
|
||||
return node;
|
||||
}
|
||||
|
||||
static struct crs_node *
|
||||
auto_window_node(const struct crs_nodedims *const dims) {
|
||||
static struct ct_node *
|
||||
auto_window_node(const struct ct_dims *const dims) {
|
||||
WINDOW *win = newwin(dims->height, dims->width, dims->y, dims->x);
|
||||
return init_window_node(win);
|
||||
}
|
||||
|
||||
static struct crs_node *init_abstract_node(struct crs_node *const node0,
|
||||
struct crs_node *const node1,
|
||||
const enum crs_axis axis,
|
||||
static struct ct_node *init_abstract_node(struct ct_node *const node0,
|
||||
struct ct_node *const node1,
|
||||
const enum ct_axis axis,
|
||||
const float ratio,
|
||||
struct crs_nodedims *const dims) {
|
||||
struct crs_node *node = __alloc_node(NODE_ABSTRACT);
|
||||
struct ct_dims *const dims) {
|
||||
struct ct_node *node = __alloc_node(NODE_ABSTRACT);
|
||||
node->axis = axis;
|
||||
node->ratio = ratio;
|
||||
node->dims = dims;
|
||||
|
|
@ -43,7 +43,7 @@ static struct crs_node *init_abstract_node(struct crs_node *const node0,
|
|||
return node;
|
||||
}
|
||||
|
||||
void destroy_node(struct crs_node *const node) {
|
||||
void destroy_node(struct ct_node *const node) {
|
||||
if (node->type == NODE_WINDOW) {
|
||||
/* Window Node */
|
||||
delwin(node->win);
|
||||
|
|
@ -59,12 +59,12 @@ end:
|
|||
free(node);
|
||||
}
|
||||
|
||||
static inline struct crs_nodedims *__alloc_dims(int x, int y, int width,
|
||||
static inline struct ct_dims *__alloc_dims(int x, int y, int width,
|
||||
int height) {
|
||||
struct crs_nodedims *dims;
|
||||
struct ct_dims *dims;
|
||||
|
||||
dims = (struct crs_nodedims *)malloc(sizeof(struct crs_nodedims));
|
||||
*dims = (struct crs_nodedims){
|
||||
dims = (struct ct_dims *)malloc(sizeof(struct ct_dims));
|
||||
*dims = (struct ct_dims){
|
||||
.x = x,
|
||||
.y = y,
|
||||
.width = width,
|
||||
|
|
@ -73,23 +73,23 @@ static inline struct crs_nodedims *__alloc_dims(int x, int y, int width,
|
|||
return dims;
|
||||
}
|
||||
|
||||
static inline struct crs_nodedims *
|
||||
__dup_dims(const struct crs_nodedims *const dims) {
|
||||
struct crs_nodedims *dup;
|
||||
dup = (struct crs_nodedims *)malloc(sizeof(struct crs_nodedims));
|
||||
memcpy(dup, dims, sizeof(struct crs_nodedims));
|
||||
static inline struct ct_dims *
|
||||
__dup_dims(const struct ct_dims *const dims) {
|
||||
struct ct_dims *dup;
|
||||
dup = (struct ct_dims *)malloc(sizeof(struct ct_dims));
|
||||
memcpy(dup, dims, sizeof(struct ct_dims));
|
||||
|
||||
return dup;
|
||||
}
|
||||
|
||||
static inline struct crs_nodedims *termdims(void) {
|
||||
struct crs_nodedims *dims = __alloc_dims(0, 0, 0, 0);
|
||||
static inline struct ct_dims *termdims(void) {
|
||||
struct ct_dims *dims = __alloc_dims(0, 0, 0, 0);
|
||||
termsize(dims->width, dims->height);
|
||||
|
||||
return dims;
|
||||
}
|
||||
|
||||
static inline void nodesize(const struct crs_node *const node, int *const width,
|
||||
static inline void nodesize(const struct ct_node *const node, int *const width,
|
||||
int *const height) {
|
||||
if (node->type == NODE_WINDOW) {
|
||||
/* Window Node */
|
||||
|
|
@ -102,11 +102,11 @@ static inline void nodesize(const struct crs_node *const node, int *const width,
|
|||
}
|
||||
}
|
||||
|
||||
static inline struct crs_nodedims *nodedims(const struct crs_node *const node) {
|
||||
struct crs_nodedims *dims;
|
||||
static inline struct ct_dims *nodedims(const struct ct_node *const node) {
|
||||
struct ct_dims *dims;
|
||||
if (node->type == NODE_WINDOW) {
|
||||
/* Window Node */
|
||||
dims = (struct crs_nodedims *)malloc(sizeof(struct crs_nodedims));
|
||||
dims = (struct ct_dims *)malloc(sizeof(struct ct_dims));
|
||||
getbegyx(node->win, dims->y, dims->x);
|
||||
getmaxyx(node->win, dims->height, dims->width);
|
||||
} else {
|
||||
|
|
@ -123,12 +123,12 @@ static inline struct crs_nodedims *nodedims(const struct crs_node *const node) {
|
|||
* WARNING: This function does not guarantee the x,y positions returned
|
||||
* WARNING: are valid screen coordinates.
|
||||
*/
|
||||
static int bifurcate_dims(const struct crs_nodedims *const parent_dims,
|
||||
const enum crs_axis axis, const float ratio,
|
||||
struct crs_nodedims **const dims0,
|
||||
struct crs_nodedims **const dims1) {
|
||||
static int bifurcate_dims(const struct ct_dims *const parent_dims,
|
||||
const enum ct_axis axis, const float ratio,
|
||||
struct ct_dims **const dims0,
|
||||
struct ct_dims **const dims1) {
|
||||
assert(0 < ratio && ratio < 1);
|
||||
struct crs_nodedims *_dims0, *_dims1;
|
||||
struct ct_dims *_dims0, *_dims1;
|
||||
|
||||
_dims0 = __dup_dims(parent_dims);
|
||||
_dims1 = __dup_dims(parent_dims);
|
||||
|
|
@ -156,8 +156,8 @@ static int bifurcate_dims(const struct crs_nodedims *const parent_dims,
|
|||
* NOTE: a call doupdate(3x) call afterwards to flush ncurses
|
||||
* NOTE: virtual screen to the physical screen.
|
||||
*/
|
||||
void resize_node(struct crs_node *const node,
|
||||
struct crs_nodedims *const new_dims) {
|
||||
void resize_node(struct ct_node *const node,
|
||||
struct ct_dims *const new_dims) {
|
||||
if (node->type == NODE_WINDOW) {
|
||||
/* Window Node */
|
||||
resizemv_window(new_dims->x, new_dims->y, new_dims->width, new_dims->height,
|
||||
|
|
@ -168,7 +168,7 @@ void resize_node(struct crs_node *const node,
|
|||
} else {
|
||||
/* Abstract Node */
|
||||
assert(node->type == NODE_ABSTRACT);
|
||||
struct crs_nodedims *dims0, *dims1;
|
||||
struct ct_dims *dims0, *dims1;
|
||||
|
||||
free(node->dims);
|
||||
node->dims = new_dims;
|
||||
|
|
@ -185,14 +185,14 @@ void resize_node(struct crs_node *const node,
|
|||
* axis - controls which direction the subdivision occurs
|
||||
* invert_axis - invert index of the original node in the new abstract node
|
||||
*/
|
||||
void bifurcate_window_node(struct crs_node **const node,
|
||||
const enum crs_axis axis, const int invert_axis,
|
||||
void bifurcate_window_node(struct ct_node **const node,
|
||||
const enum ct_axis axis, const int invert_axis,
|
||||
const float ratio) {
|
||||
assert((*node)->type == NODE_WINDOW);
|
||||
struct crs_nodedims *dims0, *dims1;
|
||||
struct crs_node *node0, *node1;
|
||||
struct ct_dims *dims0, *dims1;
|
||||
struct ct_node *node0, *node1;
|
||||
|
||||
struct crs_nodedims *original_dims = nodedims(*node);
|
||||
struct ct_dims *original_dims = nodedims(*node);
|
||||
if (bifurcate_dims(original_dims, axis, ratio, &dims0, &dims1)) {
|
||||
/* TODO: handle this error properly */
|
||||
free(original_dims);
|
||||
|
|
@ -218,7 +218,7 @@ void bifurcate_window_node(struct crs_node **const node,
|
|||
/* Collapse an abstract node, killing one child node and resizing
|
||||
* the other to take its place.
|
||||
*/
|
||||
static void collapse_abstract_node(struct crs_node **const node,
|
||||
static void collapse_abstract_node(struct ct_node **const node,
|
||||
const int collapse_i) {
|
||||
assert((*node)->type == NODE_ABSTRACT);
|
||||
assert(0 <= collapse_i && collapse_i < NODE_CHILD_N);
|
||||
|
|
@ -226,7 +226,7 @@ static void collapse_abstract_node(struct crs_node **const node,
|
|||
// WARNING: only works for NODE_CHILD_N=2 (binary trees)
|
||||
destroy_node((*node)->child[!collapse_i]);
|
||||
|
||||
struct crs_node *collapse_target = (*node)->child[collapse_i];
|
||||
struct ct_node *collapse_target = (*node)->child[collapse_i];
|
||||
free(*node);
|
||||
*node = collapse_target;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue