Mirrors/VILLASnode
1
0
Fork 0
mirror of https://git.rwth-aachen.de/acs/public/villas/node/ synced 2025-03-30 00:00:11 +01:00
Code Issues Releases Wiki Activity

move box drawing chars to boxes.hpp

Browse source
This commit is contained in:
Steffen Vogel 2019-04-07 15:45:55 +02:00
parent 4abea3a78f
commit 65600fde0b
3 changed files with 35 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
common/include/villas/boxes.hpp
View file

@ -23,9 +23,7 @@
#pragma once #pragma once
/* Alternate character set /* The suffixed of the BOX_ macro a constructed by
*
* The suffixed of the BOX_ macro a constructed by
* combining the following letters in the written order: * combining the following letters in the written order:
* - U for a line facing upwards * - U for a line facing upwards
* - D for a line facing downwards * - D for a line facing downwards
@ -35,13 +33,36 @@
* E.g. a cross can be constructed by combining all line fragments: * E.g. a cross can be constructed by combining all line fragments:
* BOX_UDLR * BOX_UDLR
*/ */
#define BOX(chr) "\e(0" chr "\e(B" #if 0 /* Alternate character set */
#define BOX_LR BOX("\x71") /**< Boxdrawing: ─ */ #define BOX(chr) "\e(0" chr "\e(B"
#define BOX_UD BOX("\x78") /**< Boxdrawing: │ */ #define BOX_LR BOX("\x71") /**< Boxdrawing: ─ */
#define BOX_UDR BOX("\x74") /**< Boxdrawing: ├ */ #define BOX_UD BOX("\x78") /**< Boxdrawing: │ */
#define BOX_UDLR BOX("\x6E") /**< Boxdrawing: ┼ */ #define BOX_UDR BOX("\x74") /**< Boxdrawing: ├ */
#define BOX_UDL BOX("\x75") /**< Boxdrawing: ┤ */ #define BOX_UDLR BOX("\x6E") /**< Boxdrawing: ┼ */
#define BOX_ULR BOX("\x76") /**< Boxdrawing: ┴ */ #define BOX_UDL BOX("\x75") /**< Boxdrawing: ┤ */
#define BOX_UL BOX("\x6A") /**< Boxdrawing: ┘ */ #define BOX_ULR BOX("\x76") /**< Boxdrawing: ┴ */
#define BOX_DLR BOX("\x77") /**< Boxdrawing: ┘ */ #define BOX_UL BOX("\x6A") /**< Boxdrawing: ┘ */
#define BOX_DL BOX("\x6B") /**< Boxdrawing: ┘ */ #define BOX_DLR BOX("\x77") /**< Boxdrawing: ┘ */
#define BOX_DL BOX("\x6B") /**< Boxdrawing: ┘ */
#elif 1 /* UTF-8 */
#define BOX_LR "─" /**< Boxdrawing: ─ */
#define BOX_UD "│" /**< Boxdrawing: │ */
#define BOX_UDR "├" /**< Boxdrawing: ├ */
#define BOX_UDLR "┼" /**< Boxdrawing: ┼ */
#define BOX_UDL "┤" /**< Boxdrawing: ┤ */
#define BOX_ULR "┴" /**< Boxdrawing: ┴ */
#define BOX_UL "┘" /**< Boxdrawing: ┘ */
#define BOX_DLR "┬" /**< Boxdrawing: ┘ */
#define BOX_DL "┐" /**< Boxdrawing: ┘ */
#define BOX_UR "└" /**< Boxdrawing: └ */
#else /* ASCII */
#define BOX_LR "-" /**< Boxdrawing: ─ */
#define BOX_UD "|" /**< Boxdrawing: │ */
#define BOX_UDR "+" /**< Boxdrawing: ├ */
#define BOX_UDLR "+" /**< Boxdrawing: ┼ */
#define BOX_UDL "+" /**< Boxdrawing: ┤ */
#define BOX_ULR "+" /**< Boxdrawing: ┴ */
#define BOX_UL "+" /**< Boxdrawing: ┘ */
#define BOX_DLR "+" /**< Boxdrawing: ┘ */
#define BOX_DL "+" /**< Boxdrawing: ┘ */
#endif

45
common/include/villas/utils.h
View file

@ -57,51 +57,6 @@ extern "C" {
#define CLR_WHT(str) CLR(37, str) /**< Print str in white */ #define CLR_WHT(str) CLR(37, str) /**< Print str in white */
#define CLR_BLD(str) CLR( 1, str) /**< Print str in bold */ #define CLR_BLD(str) CLR( 1, str) /**< Print str in bold */
/* The suffixed of the BOX_ macro a constructed by
* combining the following letters in the written order:
* - U for a line facing upwards
* - D for a line facing downwards
* - L for a line facing leftwards
* - R for a line facing rightwards
*
* E.g. a cross can be constructed by combining all line fragments:
* BOX_UDLR
*/
#if 0 /* Alternate character set */
#define BOX(chr) "\e(0" chr "\e(B"
#define BOX_LR BOX("\x71") /**< Boxdrawing: ─ */
#define BOX_UD BOX("\x78") /**< Boxdrawing: │ */
#define BOX_UDR BOX("\x74") /**< Boxdrawing: ├ */
#define BOX_UDLR BOX("\x6E") /**< Boxdrawing: ┼ */
#define BOX_UDL BOX("\x75") /**< Boxdrawing: ┤ */
#define BOX_ULR BOX("\x76") /**< Boxdrawing: ┴ */
#define BOX_UL BOX("\x6A") /**< Boxdrawing: ┘ */
#define BOX_DLR BOX("\x77") /**< Boxdrawing: ┘ */
#define BOX_DL BOX("\x6B") /**< Boxdrawing: ┘ */
#elif 1 /* UTF-8 */
#define BOX_LR "─" /**< Boxdrawing: ─ */
#define BOX_UD "│" /**< Boxdrawing: │ */
#define BOX_UDR "├" /**< Boxdrawing: ├ */
#define BOX_UDLR "┼" /**< Boxdrawing: ┼ */
#define BOX_UDL "┤" /**< Boxdrawing: ┤ */
#define BOX_ULR "┴" /**< Boxdrawing: ┴ */
#define BOX_UL "┘" /**< Boxdrawing: ┘ */
#define BOX_DLR "┬" /**< Boxdrawing: ┘ */
#define BOX_DL "┐" /**< Boxdrawing: ┘ */
#define BOX_UR "└" /**< Boxdrawing: └ */
#else /* ASCII */
#define BOX_LR "-" /**< Boxdrawing: ─ */
#define BOX_UD "|" /**< Boxdrawing: │ */
#define BOX_UDR "+" /**< Boxdrawing: ├ */
#define BOX_UDLR "+" /**< Boxdrawing: ┼ */
#define BOX_UDL "+" /**< Boxdrawing: ┤ */
#define BOX_ULR "+" /**< Boxdrawing: ┴ */
#define BOX_UL "+" /**< Boxdrawing: ┘ */
#define BOX_DLR "+" /**< Boxdrawing: ┘ */
#define BOX_DL "+" /**< Boxdrawing: ┘ */
#endif
/* CPP stringification */ /* CPP stringification */
#define XSTR(x) STR(x) #define XSTR(x) STR(x)
#define STR(x) #x #define STR(x) #x

1
common/lib/table.cpp
View file

@ -25,6 +25,7 @@
#include <villas/utils.h> #include <villas/utils.h>
#include <villas/table.hpp> #include <villas/table.hpp>
#include <villas/boxes.hpp>
#include <villas/log.h> #include <villas/log.h>
int Table::resize(int w) int Table::resize(int w)