From 10fdc8e4a7b5afa85f3b8b19c75dcf40bcf05a41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= Date: Fri, 30 Aug 2024 11:20:38 +0800 Subject: [PATCH] Logo (Builtin): make ubuntu logo colorable --- src/logo/ascii/ubuntu.txt | 40 ++++----- src/logo/ascii/ubuntu2_small.txt | 11 --- src/logo/ascii/ubuntu_old.txt | 10 +-- .../{ubuntu2_old.txt => ubuntu_old2.txt} | 0 src/logo/ascii/ubuntu_old2_small.txt | 6 ++ src/logo/ascii/ubuntu_small.txt | 17 ++-- src/logo/builtin.c | 89 +++++++++---------- 7 files changed, 86 insertions(+), 87 deletions(-) delete mode 100644 src/logo/ascii/ubuntu2_small.txt rename src/logo/ascii/{ubuntu2_old.txt => ubuntu_old2.txt} (100%) create mode 100644 src/logo/ascii/ubuntu_old2_small.txt diff --git a/src/logo/ascii/ubuntu.txt b/src/logo/ascii/ubuntu.txt index 398d8bb20..51515e782 100644 --- a/src/logo/ascii/ubuntu.txt +++ b/src/logo/ascii/ubuntu.txt @@ -1,20 +1,20 @@ - .... - .',:clooo: .:looooo:. - .;looooooooc .oooooooooo' - .;looooool:,''. :ooooooooooc - ;looool;. 'oooooooooo, - ;clool' .cooooooc. ,, - ... ...... .:oo, - .;clol:,. .loooo' - :ooooooooo, 'ooool -'ooooooooooo. loooo. -'ooooooooool coooo. - ,loooooooc. .loooo. - .,;;;'. ;ooooc - ... ,ooool. - .cooooc. ..',,'. .cooo. - ;ooooo:. ;oooooooc. :l. - .coooooc,.. coooooooooo. - .:ooooooolc:. .ooooooooooo' - .':loooooo; ,oooooooooc - ..';::c' .;loooo:' \ No newline at end of file + .... + $2.',:clooo: $1.:looooo:. + $2.;looooooooc $1.oooooooooo' + $2.;looooool:,''. $1:ooooooooooc + $2;looool;. $1'oooooooooo, + $2;clool' $1.cooooooc. $2,, + $2... $1...... $2.:oo, + $1.;clol:,. $2.loooo' + $1:ooooooooo, $2'ooool +$1'ooooooooooo. $2loooo. +$1'ooooooooool $2coooo. + $1,loooooooc. $2.loooo. + $1.,;;;'. $2;ooooc + $2... $2,ooool. + $2.cooooc. $1..',,'. $2.cooo. + $2;ooooo:. $1;oooooooc. $2:l. + $2.coooooc,.. $1coooooooooo. + $2.:ooooooolc:. $1.ooooooooooo' + $2.':loooooo; $1,oooooooooc + $2..';::c' $1.;loooo:' \ No newline at end of file diff --git a/src/logo/ascii/ubuntu2_small.txt b/src/logo/ascii/ubuntu2_small.txt deleted file mode 100644 index 4275646bc..000000000 --- a/src/logo/ascii/ubuntu2_small.txt +++ /dev/null @@ -1,11 +0,0 @@ - ..;,; .,;,. - .,lool: .ooooo, - ;oo;: .coool. - .... ''' ,l; -:oooo, 'oo. -looooc :oo' - '::' ,oo: - ,., .... co, - lo:;. :oooo; . - ':ooo; cooooc - ''' '''' \ No newline at end of file diff --git a/src/logo/ascii/ubuntu_old.txt b/src/logo/ascii/ubuntu_old.txt index 6e4c939f9..9193c8fc2 100644 --- a/src/logo/ascii/ubuntu_old.txt +++ b/src/logo/ascii/ubuntu_old.txt @@ -3,16 +3,16 @@ -+ssssssssssssssssssyyssss+- .ossssssssssssssssssd$2MMMNy$1sssso. /sssssssssss$2hdmmNNmmyNMMMMh$1ssssss/ - +sssssssss$2hmydMMMMMMMNddddy$1ssssssss+ - /ssssssss$2hNMMMyhhyyyyhmNMMMNh$1ssssssss/ + +sssssssss$2hm$1yd$2MMMMMMMNddddy$1ssssssss+ + /ssssssss$2hNMMM$1yh$2hyyyyhmNMMMNh$1ssssssss/ .ssssssss$2dMMMNh$1ssssssssss$2hNMMMd$1ssssssss. +ssss$2hhhyNMMNy$1ssssssssssss$2yNMMMy$1sssssss+ oss$2yNMMMNyMMh$1ssssssssssssss$2hmmmh$1ssssssso -oss$2yNMMMNyMMh$1ssssssssssssss$2hmmmh$1ssssssso +oss$2yNMMMNyMMh$1sssssssssssssshmmmhssssssso +ssss$2hhhyNMMNy$1ssssssssssss$2yNMMMy$1sssssss+ .ssssssss$2dMMMNh$1ssssssssss$2hNMMMd$1ssssssss. - /ssssssss$2hNMMMyhhyyyyhdNMMMNh$1ssssssss/ - +sssssssss$2dmydMMMMMMMMddddy$1ssssssss+ + /ssssssss$2hNMMM$1yh$2hyyyyhdNMMMNh$1ssssssss/ + +sssssssss$2dm$1yd$2MMMMMMMMddddy$1ssssssss+ /sssssssssss$2hdmNNNNmyNMMMMh$1ssssss/ .ossssssssssssssssss$2dMMMNy$1sssso. -+sssssssssssssssss$2yyy$1ssss+- diff --git a/src/logo/ascii/ubuntu2_old.txt b/src/logo/ascii/ubuntu_old2.txt similarity index 100% rename from src/logo/ascii/ubuntu2_old.txt rename to src/logo/ascii/ubuntu_old2.txt diff --git a/src/logo/ascii/ubuntu_old2_small.txt b/src/logo/ascii/ubuntu_old2_small.txt new file mode 100644 index 000000000..491b534a6 --- /dev/null +++ b/src/logo/ascii/ubuntu_old2_small.txt @@ -0,0 +1,6 @@ + _ + ---(_) + _/ --- \ +(_) | | + \ --- _/ + ---(_) \ No newline at end of file diff --git a/src/logo/ascii/ubuntu_small.txt b/src/logo/ascii/ubuntu_small.txt index 491b534a6..62c422390 100644 --- a/src/logo/ascii/ubuntu_small.txt +++ b/src/logo/ascii/ubuntu_small.txt @@ -1,6 +1,11 @@ - _ - ---(_) - _/ --- \ -(_) | | - \ --- _/ - ---(_) \ No newline at end of file + $2..;,; $1.,;,. + $2.,lool: $1.ooooo, + $2;oo;: $1.coool. + $1.... $1''' $2,l; +$1:oooo, $2'oo. +$1looooc $2:oo' + $1'::' $2,oo: + $2,., $1.... $2co, + $2lo:;. $1:oooo; $2. + $2':ooo; $1cooooc + $2''' $1'''' \ No newline at end of file diff --git a/src/logo/builtin.c b/src/logo/builtin.c index b1872aaff..9d67a7840 100644 --- a/src/logo/builtin.c +++ b/src/logo/builtin.c @@ -4284,6 +4284,26 @@ static const FFlogo U[] = { { .names = {"ubuntu", "ubuntu-linux"}, .lines = FASTFETCH_DATATEXT_LOGO_UBUNTU, + .colors = { + FF_COLOR_FG_RED, + FF_COLOR_FG_RED, + }, + }, + // UbuntuSmall + { + .names = {"ubuntu_small", "ubuntu-linux-small"}, + .type = FF_LOGO_LINE_TYPE_SMALL_BIT, + .lines = FASTFETCH_DATATEXT_LOGO_UBUNTU_SMALL, + .colors = { + FF_COLOR_FG_RED, + FF_COLOR_FG_RED, + }, + }, + // UbuntuOld + { + .names = {"ubuntu_old", "ubuntu-linux_old"}, + .type = FF_LOGO_LINE_TYPE_ALTER_BIT, + .lines = FASTFETCH_DATATEXT_LOGO_UBUNTU_OLD, .colors = { FF_COLOR_FG_RED, FF_COLOR_FG_WHITE, @@ -4291,6 +4311,30 @@ static const FFlogo U[] = { .colorKeys = FF_COLOR_FG_RED, .colorTitle = FF_COLOR_FG_RED, }, + // UbuntuOld2 + { + .names = {"ubuntu_old2"}, + .type = FF_LOGO_LINE_TYPE_ALTER_BIT, + .lines = FASTFETCH_DATATEXT_LOGO_UBUNTU_OLD2, + .colors = { + FF_COLOR_FG_RED, + FF_COLOR_FG_WHITE, + FF_COLOR_FG_YELLOW, + }, + .colorKeys = FF_COLOR_FG_RED, + .colorTitle = FF_COLOR_FG_RED, + }, + // UbuntuOld2Small + { + .names = {"ubuntu_old2_small", "ubuntu_old2-small"}, + .type = FF_LOGO_LINE_TYPE_SMALL_BIT | FF_LOGO_LINE_TYPE_ALTER_BIT, + .lines = FASTFETCH_DATATEXT_LOGO_UBUNTU_OLD2_SMALL, + .colors = { + FF_COLOR_FG_RED, + }, + .colorKeys = FF_COLOR_FG_RED, + .colorTitle = FF_COLOR_FG_RED, + }, // UbuntuBudgie { .names = {"ubuntu budgie", "ubuntu-budgie"}, @@ -4348,18 +4392,6 @@ static const FFlogo U[] = { .colorKeys = FF_COLOR_FG_GREEN, .colorTitle = FF_COLOR_FG_WHITE, }, - // UbuntuOld - { - .names = {"ubuntu_old", "ubuntu-linux_old"}, - .type = FF_LOGO_LINE_TYPE_ALTER_BIT, - .lines = FASTFETCH_DATATEXT_LOGO_UBUNTU_OLD, - .colors = { - FF_COLOR_FG_RED, - FF_COLOR_FG_WHITE, - }, - .colorKeys = FF_COLOR_FG_RED, - .colorTitle = FF_COLOR_FG_RED, - }, // UbuntuKde { .names = {"ubuntu kde", "ubuntu-kde", "ubuntu-plasma"}, @@ -4371,17 +4403,6 @@ static const FFlogo U[] = { .colorKeys = FF_COLOR_FG_BLUE, .colorTitle = FF_COLOR_FG_BLUE, }, - // UbuntuSmall - { - .names = {"ubuntu_small", "ubuntu-linux-small"}, - .type = FF_LOGO_LINE_TYPE_SMALL_BIT, - .lines = FASTFETCH_DATATEXT_LOGO_UBUNTU_SMALL, - .colors = { - FF_COLOR_FG_RED, - }, - .colorKeys = FF_COLOR_FG_RED, - .colorTitle = FF_COLOR_FG_RED, - }, // UbuntuStudio { .names = {"ubuntu studio", "ubuntu-studio"}, @@ -4418,28 +4439,6 @@ static const FFlogo U[] = { FF_COLOR_FG_WHITE, }, }, - // Ubuntu2Small - { - .names = {"ubuntu2_small", "ubuntu2-small"}, - .type = FF_LOGO_LINE_TYPE_SMALL_BIT | FF_LOGO_LINE_TYPE_ALTER_BIT, - .lines = FASTFETCH_DATATEXT_LOGO_UBUNTU2_SMALL, - .colors = { - FF_COLOR_FG_RED, - }, - .colorKeys = FF_COLOR_FG_RED, - .colorTitle = FF_COLOR_FG_RED, - }, - // Ubuntu2Old - { - .names = {"ubuntu2_old"}, - .type = FF_LOGO_LINE_TYPE_ALTER_BIT, - .lines = FASTFETCH_DATATEXT_LOGO_UBUNTU2_OLD, - .colors = { - FF_COLOR_FG_RED, - FF_COLOR_FG_WHITE, - FF_COLOR_FG_YELLOW, - }, - }, // Ultramarine { .names = {"Ultramarine", "Ultramarine Linux"},