Merge pull request #22711 from yuwata/c11

move to C11 (gnu11) and use u8 specifier for special characters
This commit is contained in:
Yu Watanabe
2022-03-12 14:27:48 +09:00
committed by GitHub
5 changed files with 54 additions and 49 deletions
+9 -6
View File
@@ -11,6 +11,9 @@
#include "terminal-util.h"
#define ANSI_WHITE_ON_BLACK "\033[40;37;1m"
#define UNICODE_FULL_BLOCK u8"█"
#define UNICODE_LOWER_HALF_BLOCK u8"▄"
#define UNICODE_UPPER_HALF_BLOCK u8"▀"
static void *qrcode_dl = NULL;
@@ -30,7 +33,7 @@ static void print_border(FILE *output, unsigned width) {
fputs(ANSI_WHITE_ON_BLACK, output);
for (unsigned x = 0; x < 4 + width + 4; x++)
fputs("\342\226\210", output);
fputs(UNICODE_FULL_BLOCK, output);
fputs(ANSI_NORMAL "\n", output);
}
@@ -50,7 +53,7 @@ static void write_qrcode(FILE *output, QRcode *qr) {
fputs(ANSI_WHITE_ON_BLACK, output);
for (unsigned x = 0; x < 4; x++)
fputs("\342\226\210", output);
fputs(UNICODE_FULL_BLOCK, output);
for (unsigned x = 0; x < (unsigned) qr->width; x++) {
bool a, b;
@@ -61,15 +64,15 @@ static void write_qrcode(FILE *output, QRcode *qr) {
if (a && b)
fputc(' ', output);
else if (a)
fputs("\342\226\204", output);
fputs(UNICODE_LOWER_HALF_BLOCK, output);
else if (b)
fputs("\342\226\200", output);
fputs(UNICODE_UPPER_HALF_BLOCK, output);
else
fputs("\342\226\210", output);
fputs(UNICODE_FULL_BLOCK, output);
}
for (unsigned x = 0; x < 4; x++)
fputs("\342\226\210", output);
fputs(UNICODE_FULL_BLOCK, output);
fputs(ANSI_NORMAL "\n", output);
}