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

[F] Fixed buf

Browse Source
This commit is contained in:
seleznevae
2018-11-25 17:25:48 +03:00
parent 64abbfd41b
commit dc7640a9e4
9 changed files with 158 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/fort.c
View File

@@ -360,7 +360,7 @@ FT_INTERNAL
void *buffer_get_data(string_buffer_t *buffer);
FT_INTERNAL
size_t buffer_text_width(string_buffer_t *buffer);
size_t buffer_text_width(const string_buffer_t *buffer);
FT_INTERNAL
int buffer_printf(string_buffer_t *buffer, size_t buffer_row, char *buf, size_t total_buf_len,
@@ -4252,8 +4252,9 @@ fort_row_t *create_row_from_fmt_string(const char *fmt, va_list *va_args)
#define CREATE_ROW_FROM_STRING create_row_from_string
#define NUMBER_OF_COLUMNS_IN_FORMAT_STRING number_of_columns_in_format_string
#define FILL_CELL_FROM_STRING fill_cell_from_string
#define STR_BUF_TYPE CharBuf
string_buffer_t *buffer = create_string_buffer(DEFAULT_STR_BUF_SIZE, CharBuf);
string_buffer_t *buffer = create_string_buffer(DEFAULT_STR_BUF_SIZE, STR_BUF_TYPE);
if (buffer == NULL)
return NULL;
@@ -4325,6 +4326,7 @@ clear:
#undef CREATE_ROW_FROM_STRING
#undef NUMBER_OF_COLUMNS_IN_FORMAT_STRING
#undef FILL_CELL_FROM_STRING
#undef STR_BUF_TYPE
}
#ifdef FT_HAVE_WCHAR
@@ -4336,8 +4338,9 @@ fort_row_t *create_row_from_fmt_wstring(const wchar_t *fmt, va_list *va_args)
#define CREATE_ROW_FROM_STRING create_row_from_wstring
#define NUMBER_OF_COLUMNS_IN_FORMAT_STRING number_of_columns_in_format_wstring
#define FILL_CELL_FROM_STRING fill_cell_from_wstring
#define STR_BUF_TYPE WCharBuf
string_buffer_t *buffer = create_string_buffer(DEFAULT_STR_BUF_SIZE, CharBuf);
string_buffer_t *buffer = create_string_buffer(DEFAULT_STR_BUF_SIZE, STR_BUF_TYPE);
if (buffer == NULL)
return NULL;
@@ -4409,6 +4412,7 @@ clear:
#undef CREATE_ROW_FROM_STRING
#undef NUMBER_OF_COLUMNS_IN_FORMAT_STRING
#undef FILL_CELL_FROM_STRING
#undef STR_BUF_TYPE
}
#endif
@@ -4892,7 +4896,7 @@ size_t buffer_text_height(string_buffer_t *buffer)
FT_INTERNAL
size_t buffer_text_width(string_buffer_t *buffer)
size_t buffer_text_width(const string_buffer_t *buffer)
{
size_t max_length = 0;
if (buffer->type == CharBuf) {

61
lib/fort.h
View File

@@ -542,9 +542,6 @@ int ft_table_write(ft_table_t *table, size_t rows, size_t cols, const char *tabl
int ft_table_write_ln(ft_table_t *table, size_t rows, size_t cols, const char *table_cells[]);
/**
* Add separator after the current row.
*
@@ -557,8 +554,6 @@ int ft_table_write_ln(ft_table_t *table, size_t rows, size_t cols, const char *t
int ft_add_separator(ft_table_t *table);
/**
* Convert table to string representation.
*
@@ -584,12 +579,6 @@ const char *ft_to_string(const ft_table_t *table);
/**
* Structure describing border appearance.
*/
@@ -696,37 +685,37 @@ int ft_set_border_style(ft_table_t *table, const struct ft_border_style *style);
* Colors.
*/
enum ft_color {
FT_COLOR_DEFAULT = 0,
FT_COLOR_BLACK = 1,
FT_COLOR_RED = 2,
FT_COLOR_GREEN = 3,
FT_COLOR_YELLOW = 4,
FT_COLOR_BLUE = 5,
FT_COLOR_MAGENTA = 6,
FT_COLOR_CYAN = 7,
FT_COLOR_LIGHT_GRAY = 8,
FT_COLOR_DARK_GRAY = 9,
FT_COLOR_LIGHT_RED = 10,
FT_COLOR_LIGHT_GREEN = 11,
FT_COLOR_LIGHT_YELLOW = 12,
FT_COLOR_LIGHT_BLUE = 13,
FT_COLOR_LIGHT_MAGENTA = 15,
FT_COLOR_LIGHT_CYAN = 16,
FT_COLOR_LIGHT_WHYTE = 17
FT_COLOR_DEFAULT = 0, /**< Default color */
FT_COLOR_BLACK = 1, /**< Black color*/
FT_COLOR_RED = 2, /**< Red color */
FT_COLOR_GREEN = 3, /**< Green color */
FT_COLOR_YELLOW = 4, /**< Yellow color */
FT_COLOR_BLUE = 5, /**< Blue color */
FT_COLOR_MAGENTA = 6, /**< Magenta color */
FT_COLOR_CYAN = 7, /**< Cyan color */
FT_COLOR_LIGHT_GRAY = 8, /**< Light gray color */
FT_COLOR_DARK_GRAY = 9, /**< Dark gray color */
FT_COLOR_LIGHT_RED = 10, /**< Light red color */
FT_COLOR_LIGHT_GREEN = 11, /**< Light green color */
FT_COLOR_LIGHT_YELLOW = 12, /**< Light yellow color */
FT_COLOR_LIGHT_BLUE = 13, /**< Light blue color */
FT_COLOR_LIGHT_MAGENTA = 15, /**< Light magenta color */
FT_COLOR_LIGHT_CYAN = 16, /**< Light cyan color */
FT_COLOR_LIGHT_WHYTE = 17 /**< Light whyte color */
};
/**
* Text styles.
*/
enum ft_text_style {
FT_TSTYLE_DEFAULT = (1U << 0),
FT_TSTYLE_BOLD = (1U << 1),
FT_TSTYLE_DIM = (1U << 2),
FT_TSTYLE_ITALIC = (1U << 3),
FT_TSTYLE_UNDERLINED = (1U << 4),
FT_TSTYLE_BLINK = (1U << 5),
FT_TSTYLE_INVERTED = (1U << 6),
FT_TSTYLE_HIDDEN = (1U << 7)
FT_TSTYLE_DEFAULT = (1U << 0), /**< Default style */
FT_TSTYLE_BOLD = (1U << 1), /**< Bold */
FT_TSTYLE_DIM = (1U << 2), /**< Dim */
FT_TSTYLE_ITALIC = (1U << 3), /**< Italic */
FT_TSTYLE_UNDERLINED = (1U << 4), /**< Underlined */
FT_TSTYLE_BLINK = (1U << 5), /**< Blink */
FT_TSTYLE_INVERTED = (1U << 6), /**< Reverse (invert the foreground and background colors) */
FT_TSTYLE_HIDDEN = (1U << 7) /**< Hidden (useful for passwords) */
};