3rd-party/libfort
1
0
Fork 0
Code Releases Activity

[A] Added header vert. separator

Browse Source
This commit is contained in:
seleznevae 2018-01-06 12:19:02 +03:00
parent 6dc77bd5a1
commit b9110741e7
3 changed files with 15 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/fort.h
View File

@ -111,6 +111,7 @@ struct fort_table_options
char hor_separator; char hor_separator;
char ver_separator; char ver_separator;
char header_hor_separator; char header_hor_separator;
char header_ver_separator;
}; };
typedef struct fort_table_options fort_table_options_t; typedef struct fort_table_options fort_table_options_t;

31
src/fort.c
View File

@ -177,14 +177,7 @@ static void* vector_at(vector_t*, size_t index);
/***************************************************************************** /*****************************************************************************
* CELL * CELL
* ***************************************************************************/ * ***************************************************************************/
//struct cell_options
//{
// int padding_top;
// int padding_bottom;
// int padding_left;
// int padding_right;
//};
//typedef struct cell_options cell_options_t;
typedef fort_table_options_t context_t; typedef fort_table_options_t context_t;
static fort_table_options_t g_table_options = { static fort_table_options_t g_table_options = {
1, /* cell_padding_top */ 1, /* cell_padding_top */
@ -194,19 +187,11 @@ static fort_table_options_t g_table_options = {
1, /* cell_empty_string_height */ 1, /* cell_empty_string_height */
'=', /* hor_separator */ '=', /* hor_separator */
'|', /* ver_separator */ '|', /* ver_separator */
'=' /* header_hor_separator */ '=', /* header_hor_separator */
'|' /* header_ver_separator */
}; };
//static void set_cell_options(fort_table_options_t *dst_options, const fort_table_options_t *src_options)
//{
// assert(dst_options);
// assert(src_options);
// dst_options->cell_padding_top = src_options->cell_padding_top;
// dst_options->cell_padding_bottom = src_options->cell_padding_bottom;
// dst_options->cell_padding_left = src_options->cell_padding_left;
// dst_options->cell_padding_right = src_options->cell_padding_right;
// dst_options->cell_empty_string_height = src_options->cell_empty_string_height;
//}
struct fort_cell; struct fort_cell;
typedef struct fort_cell fort_cell_t; typedef struct fort_cell fort_cell_t;
@ -970,9 +955,13 @@ static int snprintf_row(const fort_row_t *row, char *buffer, size_t buf_sz, size
if (cols_in_row > col_width_arr_sz) if (cols_in_row > col_width_arr_sz)
return -1; return -1;
const char *ver_separator = (row->is_header == F_TRUE)
? &(context->header_ver_separator)
: &(context->ver_separator);
int dev = 0; int dev = 0;
for (size_t i = 0; i < row_height; ++i) { for (size_t i = 0; i < row_height; ++i) {
dev += snprint_n_chars(buffer + dev, buf_sz - dev, 1, context->ver_separator); dev += snprint_n_chars(buffer + dev, buf_sz - dev, 1, *ver_separator);
for (size_t j = 0; j < col_width_arr_sz; ++j) { for (size_t j = 0; j < col_width_arr_sz; ++j) {
if (j < cols_in_row) { if (j < cols_in_row) {
fort_cell_t *cell = *(fort_cell_t**)vector_at(row->cells, j); fort_cell_t *cell = *(fort_cell_t**)vector_at(row->cells, j);
@ -980,7 +969,7 @@ static int snprintf_row(const fort_row_t *row, char *buffer, size_t buf_sz, size
} else { } else {
dev += snprint_n_chars(buffer + dev, buf_sz - dev, col_width_arr[j], ' '); dev += snprint_n_chars(buffer + dev, buf_sz - dev, col_width_arr[j], ' ');
} }
dev += snprint_n_chars(buffer + dev, buf_sz - dev, 1, context->ver_separator); dev += snprint_n_chars(buffer + dev, buf_sz - dev, 1, *ver_separator);
} }
dev += snprint_n_chars(buffer + dev, buf_sz - dev, 1, '\n'); dev += snprint_n_chars(buffer + dev, buf_sz - dev, 1, '\n');
} }

7
tests/test_table.c
View File

@ -437,6 +437,7 @@ void test_table_options(void **state)
table_options.hor_separator = '|'; table_options.hor_separator = '|';
table_options.ver_separator = '='; table_options.ver_separator = '=';
table_options.header_hor_separator = '*'; table_options.header_hor_separator = '*';
table_options.header_ver_separator = 'v';
ft_set_default_options(&table_options); ft_set_default_options(&table_options);
@ -447,9 +448,9 @@ void test_table_options(void **state)
assert_true( table_str != NULL ); assert_true( table_str != NULL );
const char *table_str_etalon = const char *table_str_etalon =
"*******************\n" "*******************\n"
"= = = = =\n" "v v v v v\n"
"= 3 = 4 = 55 = 67 =\n" "v 3 v 4 v 55 v 67 v\n"
"= = = = =\n" "v v v v v\n"
"*******************\n" "*******************\n"
"= = = = =\n" "= = = = =\n"
"= 3 = 4 = 55 = 67 =\n" "= 3 = 4 = 55 = 67 =\n"