mirror of
https://gitlab.freedesktop.org/pipewire/pipewire.git
synced 2025-10-29 05:40:27 -04:00
spa: add a header for ANSI color sequences
Makes the code more readable and guarantees we use the same sequences for the same colors everywhere.
This commit is contained in:
Peter Hutterer
parent
4c13eced55
commit
1a5faa7b52
4 changed files with 204 additions and 9 deletions
112
spa/include/spa/utils/ansi.h
Normal file
112
spa/include/spa/utils/ansi.h
Normal file
|
|
@ -0,0 +1,112 @@
|
|||
/* Simple Plugin API
|
||||
*
|
||||
* Copyright © 2021 Red Hat, Inc.
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a
|
||||
* copy of this software and associated documentation files (the "Software"),
|
||||
* to deal in the Software without restriction, including without limitation
|
||||
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
||||
* and/or sell copies of the Software, and to permit persons to whom the
|
||||
* Software is furnished to do so, subject to the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice (including the next
|
||||
* paragraph) shall be included in all copies or substantial portions of the
|
||||
* Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
||||
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
||||
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
||||
* DEALINGS IN THE SOFTWARE.
|
||||
*/
|
||||
|
||||
#ifndef SPA_UTILS_ANSI_H
|
||||
#define SPA_UTILS_ANSI_H
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
/** \defgroup spa_utils SPA Utils
|
||||
*/
|
||||
|
||||
/**
|
||||
* \addtogroup spa_utils
|
||||
* \{
|
||||
*/
|
||||
|
||||
/**
|
||||
* Ansi escape sequences. Note that the color names are approximate only and
|
||||
* the actual rendering of the color depends on the terminal.
|
||||
*/
|
||||
|
||||
#define SPA_ANSI_RESET "\x1B[0m"
|
||||
#define SPA_ANSI_BOLD "\x1B[1m"
|
||||
#define SPA_ANSI_ITALIC "\x1B[3m"
|
||||
#define SPA_ANSI_UNDERLINE "\x1B[4m"
|
||||
|
||||
#define SPA_ANSI_BLACK "\x1B[0;30m"
|
||||
#define SPA_ANSI_RED "\x1B[0;31m"
|
||||
#define SPA_ANSI_GREEN "\x1B[0;32m"
|
||||
#define SPA_ANSI_YELLOW "\x1B[0;33m"
|
||||
#define SPA_ANSI_BLUE "\x1B[0;34m"
|
||||
#define SPA_ANSI_MAGENTA "\x1B[0;35m"
|
||||
#define SPA_ANSI_CYAN "\x1B[0;36m"
|
||||
#define SPA_ANSI_WHITE "\x1B[0;37m"
|
||||
#define SPA_ANSI_BRIGHT_BLACK "\x1B[90m"
|
||||
#define SPA_ANSI_BRIGHT_RED "\x1B[91m"
|
||||
#define SPA_ANSI_BRIGHT_GREEN "\x1B[92m"
|
||||
#define SPA_ANSI_BRIGHT_YELLOW "\x1B[93m"
|
||||
#define SPA_ANSI_BRIGHT_BLUE "\x1B[94m"
|
||||
#define SPA_ANSI_BRIGHT_MAGENTA "\x1B[95m"
|
||||
#define SPA_ANSI_BRIGHT_CYAN "\x1B[96m"
|
||||
#define SPA_ANSI_BRIGHT_WHITE "\x1B[97m"
|
||||
|
||||
/* Shortcut because it's a common use-case and easier than combining both */
|
||||
#define SPA_ANSI_BOLD_BLACK "\x1B[1;30m"
|
||||
#define SPA_ANSI_BOLD_RED "\x1B[1;31m"
|
||||
#define SPA_ANSI_BOLD_GREEN "\x1B[1;32m"
|
||||
#define SPA_ANSI_BOLD_YELLOW "\x1B[1;33m"
|
||||
#define SPA_ANSI_BOLD_BLUE "\x1B[1;34m"
|
||||
#define SPA_ANSI_BOLD_MAGENTA "\x1B[1;35m"
|
||||
#define SPA_ANSI_BOLD_CYAN "\x1B[1;36m"
|
||||
#define SPA_ANSI_BOLD_WHITE "\x1B[1;37m"
|
||||
|
||||
#define SPA_ANSI_DARK_BLACK "\x1B[2;30m"
|
||||
#define SPA_ANSI_DARK_RED "\x1B[2;31m"
|
||||
#define SPA_ANSI_DARK_GREEN "\x1B[2;32m"
|
||||
#define SPA_ANSI_DARK_YELLOW "\x1B[2;33m"
|
||||
#define SPA_ANSI_DARK_BLUE "\x1B[2;34m"
|
||||
#define SPA_ANSI_DARK_MAGENTA "\x1B[2;35m"
|
||||
#define SPA_ANSI_DARK_CYAN "\x1B[2;36m"
|
||||
#define SPA_ANSI_DARK_WHITE "\x1B[2;37m"
|
||||
|
||||
/* Background colors */
|
||||
#define SPA_ANSI_BG_BLACK "\x1B[0;40m"
|
||||
#define SPA_ANSI_BG_RED "\x1B[0;41m"
|
||||
#define SPA_ANSI_BG_GREEN "\x1B[0;42m"
|
||||
#define SPA_ANSI_BG_YELLOW "\x1B[0;43m"
|
||||
#define SPA_ANSI_BG_BLUE "\x1B[0;44m"
|
||||
#define SPA_ANSI_BG_MAGENTA "\x1B[0;45m"
|
||||
#define SPA_ANSI_BG_CYAN "\x1B[0;46m"
|
||||
#define SPA_ANSI_BG_WHITE "\x1B[0;47m"
|
||||
#define SPA_ANSI_BG_BRIGHT_BLACK "\x1B[100m"
|
||||
#define SPA_ANSI_BG_BRIGHT_RED "\x1B[101m"
|
||||
#define SPA_ANSI_BG_BRIGHT_GREEN "\x1B[102m"
|
||||
#define SPA_ANSI_BG_BRIGHT_YELLOW "\x1B[103m"
|
||||
#define SPA_ANSI_BG_BRIGHT_BLUE "\x1B[104m"
|
||||
#define SPA_ANSI_BG_BRIGHT_MAGENTA "\x1B[105m"
|
||||
#define SPA_ANSI_BG_BRIGHT_CYAN "\x1B[106m"
|
||||
#define SPA_ANSI_BG_BRIGHT_WHITE "\x1B[107m"
|
||||
|
||||
/**
|
||||
* \}
|
||||
*/
|
||||
|
||||
#ifdef __cplusplus
|
||||
} /* extern "C" */
|
||||
#endif
|
||||
|
||||
#endif /* SPA_UTILS_ANSI_H */
|
||||
|
|
@ -37,6 +37,7 @@
|
|||
#include <spa/utils/type.h>
|
||||
#include <spa/utils/names.h>
|
||||
#include <spa/utils/string.h>
|
||||
#include <spa/utils/ansi.h>
|
||||
|
||||
#ifdef __FreeBSD__
|
||||
#define CLOCK_MONOTONIC_RAW CLOCK_MONOTONIC
|
||||
|
|
@ -88,13 +89,13 @@ impl_log_logv(void *object,
|
|||
|
||||
if (impl->colors) {
|
||||
if (level <= SPA_LOG_LEVEL_ERROR)
|
||||
prefix = "\x1B[1;31m";
|
||||
prefix = SPA_ANSI_BOLD_RED;
|
||||
else if (level <= SPA_LOG_LEVEL_WARN)
|
||||
prefix = "\x1B[1;33m";
|
||||
prefix = SPA_ANSI_BOLD_YELLOW;
|
||||
else if (level <= SPA_LOG_LEVEL_INFO)
|
||||
prefix = "\x1B[1;32m";
|
||||
prefix = SPA_ANSI_BOLD_GREEN;
|
||||
if (prefix[0])
|
||||
suffix = "\x1B[0m";
|
||||
suffix = SPA_ANSI_RESET;
|
||||
}
|
||||
|
||||
p = location;
|
||||
|
|
|
|||
|
|
@ -30,6 +30,7 @@
|
|||
#include <spa/utils/ringbuffer.h>
|
||||
#include <spa/utils/string.h>
|
||||
#include <spa/utils/type.h>
|
||||
#include <spa/utils/ansi.h>
|
||||
|
||||
static void test_abi(void)
|
||||
{
|
||||
|
|
@ -510,6 +511,85 @@ static void test_atob(void)
|
|||
spa_assert(!spa_atob("TRUE"));
|
||||
}
|
||||
|
||||
static void test_ansi(void)
|
||||
{
|
||||
/* Visual test only */
|
||||
printf("%sBOLD%s\n", SPA_ANSI_BOLD, SPA_ANSI_RESET);
|
||||
printf("%sUNDERLINE%s\n", SPA_ANSI_UNDERLINE, SPA_ANSI_RESET);
|
||||
printf("%sITALIC%s\n", SPA_ANSI_ITALIC, SPA_ANSI_RESET);
|
||||
|
||||
printf("%sBLACK%s\n", SPA_ANSI_BLACK, SPA_ANSI_RESET);
|
||||
printf("%sBRIGHT_BLACK%s\n", SPA_ANSI_BRIGHT_BLACK, SPA_ANSI_RESET);
|
||||
printf("%sDARK_BLACK%s\n", SPA_ANSI_DARK_BLACK, SPA_ANSI_RESET);
|
||||
printf("%sBOLD_BLACK%s\n", SPA_ANSI_BOLD_BLACK, SPA_ANSI_RESET);
|
||||
|
||||
printf("%sRED%s\n", SPA_ANSI_RED, SPA_ANSI_RESET);
|
||||
printf("%sBRIGHT_RED%s\n", SPA_ANSI_BRIGHT_RED, SPA_ANSI_RESET);
|
||||
printf("%sDARK_RED%s\n", SPA_ANSI_DARK_RED, SPA_ANSI_RESET);
|
||||
printf("%sBOLD_RED%s\n", SPA_ANSI_BOLD_RED, SPA_ANSI_RESET);
|
||||
|
||||
printf("%sGREEN%s\n", SPA_ANSI_GREEN, SPA_ANSI_RESET);
|
||||
printf("%sBRIGHT_GREEN%s\n", SPA_ANSI_BRIGHT_GREEN, SPA_ANSI_RESET);
|
||||
printf("%sDARK_GREEN%s\n", SPA_ANSI_DARK_GREEN, SPA_ANSI_RESET);
|
||||
printf("%sBOLD_GREEN%s\n", SPA_ANSI_BOLD_GREEN, SPA_ANSI_RESET);
|
||||
|
||||
printf("%sYELLOW%s\n", SPA_ANSI_YELLOW, SPA_ANSI_RESET);
|
||||
printf("%sBRIGHT_YELLOW%s\n", SPA_ANSI_BRIGHT_YELLOW, SPA_ANSI_RESET);
|
||||
printf("%sDARK_YELLOW%s\n", SPA_ANSI_DARK_YELLOW, SPA_ANSI_RESET);
|
||||
printf("%sBOLD_YELLOW%s\n", SPA_ANSI_BOLD_YELLOW, SPA_ANSI_RESET);
|
||||
|
||||
printf("%sBLUE%s\n", SPA_ANSI_BLUE, SPA_ANSI_RESET);
|
||||
printf("%sBRIGHT_BLUE%s\n", SPA_ANSI_BRIGHT_BLUE, SPA_ANSI_RESET);
|
||||
printf("%sDARK_BLUE%s\n", SPA_ANSI_DARK_BLUE, SPA_ANSI_RESET);
|
||||
printf("%sBOLD_BLUE%s\n", SPA_ANSI_BOLD_BLUE, SPA_ANSI_RESET);
|
||||
|
||||
printf("%sMAGENTA%s\n", SPA_ANSI_MAGENTA, SPA_ANSI_RESET);
|
||||
printf("%sBRIGHT_MAGENTA%s\n", SPA_ANSI_BRIGHT_MAGENTA, SPA_ANSI_RESET);
|
||||
printf("%sDARK_MAGENTA%s\n", SPA_ANSI_DARK_MAGENTA, SPA_ANSI_RESET);
|
||||
printf("%sBOLD_MAGENTA%s\n", SPA_ANSI_BOLD_MAGENTA, SPA_ANSI_RESET);
|
||||
|
||||
printf("%sCYAN%s\n", SPA_ANSI_CYAN, SPA_ANSI_RESET);
|
||||
printf("%sBRIGHT_CYAN%s\n", SPA_ANSI_BRIGHT_CYAN, SPA_ANSI_RESET);
|
||||
printf("%sDARK_CYAN%s\n", SPA_ANSI_DARK_CYAN, SPA_ANSI_RESET);
|
||||
printf("%sBOLD_CYAN%s\n", SPA_ANSI_BOLD_CYAN, SPA_ANSI_RESET);
|
||||
|
||||
printf("%sWHITE%s\n", SPA_ANSI_WHITE, SPA_ANSI_RESET);
|
||||
printf("%sBRIGHT_WHITE%s\n", SPA_ANSI_BRIGHT_WHITE, SPA_ANSI_RESET);
|
||||
printf("%sDARK_WHITE%s\n", SPA_ANSI_DARK_WHITE, SPA_ANSI_RESET);
|
||||
printf("%sBOLD_WHITE%s\n", SPA_ANSI_BOLD_WHITE, SPA_ANSI_RESET);
|
||||
|
||||
|
||||
/* Background colors */
|
||||
|
||||
printf("%sBG_BLACK%s\n", SPA_ANSI_BG_BLACK, SPA_ANSI_RESET);
|
||||
printf("%sBG_BRIGHT_BLACK%s\n", SPA_ANSI_BG_BRIGHT_BLACK, SPA_ANSI_RESET);
|
||||
|
||||
printf("%sBG_RED%s\n", SPA_ANSI_BG_RED, SPA_ANSI_RESET);
|
||||
printf("%sBG_BRIGHT_RED%s\n", SPA_ANSI_BG_BRIGHT_RED, SPA_ANSI_RESET);
|
||||
|
||||
printf("%sBG_GREEN%s\n", SPA_ANSI_BG_GREEN, SPA_ANSI_RESET);
|
||||
printf("%sBG_BRIGHT_GREEN%s\n", SPA_ANSI_BG_BRIGHT_GREEN, SPA_ANSI_RESET);
|
||||
|
||||
printf("%sBG_YELLOW%s\n", SPA_ANSI_BG_YELLOW, SPA_ANSI_RESET);
|
||||
printf("%sBG_BRIGHT_YELLOW%s\n", SPA_ANSI_BG_BRIGHT_YELLOW, SPA_ANSI_RESET);
|
||||
|
||||
printf("%sBG_BLUE%s\n", SPA_ANSI_BG_BLUE, SPA_ANSI_RESET);
|
||||
printf("%sBG_BRIGHT_BLUE%s\n", SPA_ANSI_BG_BRIGHT_BLUE, SPA_ANSI_RESET);
|
||||
|
||||
printf("%sBG_MAGENTA%s\n", SPA_ANSI_BG_MAGENTA, SPA_ANSI_RESET);
|
||||
printf("%sBG_BRIGHT_MAGENTA%s\n", SPA_ANSI_BG_BRIGHT_MAGENTA, SPA_ANSI_RESET);
|
||||
|
||||
printf("%sBG_CYAN%s\n", SPA_ANSI_BG_CYAN, SPA_ANSI_RESET);
|
||||
printf("%sBG_BRIGHT_CYAN%s\n", SPA_ANSI_BG_BRIGHT_CYAN, SPA_ANSI_RESET);
|
||||
|
||||
printf("%sBG_WHITE%s\n", SPA_ANSI_BG_WHITE, SPA_ANSI_RESET);
|
||||
printf("%sBG_BRIGHT_WHITE%s\n", SPA_ANSI_BG_BRIGHT_WHITE, SPA_ANSI_RESET);
|
||||
|
||||
/* A combo */
|
||||
printf("normal%s%s%sBG_BLUE,ITALIC,BOLD_YELLOW%snormal\n", SPA_ANSI_BG_BLUE,
|
||||
SPA_ANSI_ITALIC, SPA_ANSI_BOLD_YELLOW, SPA_ANSI_RESET);
|
||||
}
|
||||
|
||||
int main(int argc, char *argv[])
|
||||
{
|
||||
test_abi();
|
||||
|
|
@ -522,5 +602,6 @@ int main(int argc, char *argv[])
|
|||
test_strtol();
|
||||
test_streq();
|
||||
test_atob();
|
||||
test_ansi();
|
||||
return 0;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -35,6 +35,7 @@
|
|||
#include <spa/pod/iter.h>
|
||||
#include <spa/debug/types.h>
|
||||
#include <spa/utils/json.h>
|
||||
#include <spa/utils/ansi.h>
|
||||
|
||||
#include <pipewire/pipewire.h>
|
||||
#include <extensions/metadata.h>
|
||||
|
|
@ -43,11 +44,11 @@
|
|||
|
||||
static bool colors = false;
|
||||
|
||||
#define NORMAL (colors ? "\x1B[0m":"")
|
||||
#define LITERAL (colors ? "\x1B[95m":"")
|
||||
#define NUMBER (colors ? "\x1B[96m":"")
|
||||
#define STRING (colors ? "\x1B[92m":"")
|
||||
#define KEY (colors ? "\x1B[94m":"")
|
||||
#define NORMAL (colors ? SPA_ANSI_RESET : "")
|
||||
#define LITERAL (colors ? SPA_ANSI_BRIGHT_MAGENTA : "")
|
||||
#define NUMBER (colors ? SPA_ANSI_BRIGHT_CYAN : "")
|
||||
#define STRING (colors ? SPA_ANSI_BRIGHT_GREEN : "")
|
||||
#define KEY (colors ? SPA_ANSI_BRIGHT_BLUE : "")
|
||||
|
||||
struct data {
|
||||
struct pw_main_loop *loop;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue