Skip to content

Better formatting #36

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mfontani merged 4 commits into from
Aug 17, 2025
Merged

Better formatting #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6d97d7c
add/use docker-based clang-format
mfontani Aug 17, 2025
84688a6
main.c: add SAY/WARN macros, use, and reformat
mfontani Aug 17, 2025
6b35f8d
main.c: neater VRGB/VRGB17 macros
mfontani Aug 17, 2025
95452df
bump palettes 20250817
mfontani Aug 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .dockerignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
*
4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,9 @@ ansi2html: Makefile $(C_FILES) $(H_FILES)
all: format tags ansi2html

.PHONY: format
format: Makefile $(C_FILES) $(H_FILES)
format: scripts/format.sh Makefile $(C_FILES) $(H_FILES)
@start=$$(perl -MTime::HiRes=gettimeofday -E'say scalar gettimeofday')
@clang-format -i $(C_FILES) $(H_FILES)
@./scripts/format.sh clang-format -i $(C_FILES) $(H_FILES)
@end=$$(perl -MTime::HiRes=gettimeofday -E'say scalar gettimeofday')
@perl -E'say sprintf "Format time: %.4f seconds", $$ARGV[1] - $$ARGV[0]' "$$start" "$$end"

Expand Down
27 changes: 27 additions & 0 deletions scripts/format.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
#!/bin/bash
set -euo pipefail
DEBIAN_VERSION=bookworm
CLANG_VERSION=20
docker build -t ansi2html-formatter . -f-<<END_DOCKERFILE
FROM debian:$DEBIAN_VERSION
RUN apt-get -qq update; \
apt-get install -qqy --no-install-recommends \
gnupg2 wget ca-certificates apt-transport-https \
autoconf automake cmake dpkg-dev file make patch libc6-dev
RUN echo "deb https://apt.llvm.org/$DEBIAN_VERSION llvm-toolchain-$DEBIAN_VERSION-$CLANG_VERSION main" \
> /etc/apt/sources.list.d/llvm.list && \
wget -qO /etc/apt/trusted.gpg.d/llvm.asc \
https://apt.llvm.org/llvm-snapshot.gpg.key && \
apt-get -qq update && \
apt-get install -qqy -t $DEBIAN_VERSION \
clang-$CLANG_VERSION clang-tidy-$CLANG_VERSION clang-format-$CLANG_VERSION lld-$CLANG_VERSION \
&& \
for f in /usr/lib/llvm-*/bin/*; do ln -sf "\$f" /usr/bin; done && \
ln -sf clang /usr/bin/cc && \
ln -sf clang /usr/bin/c89 && \
ln -sf clang /usr/bin/c99 && \
ln -sf clang++ /usr/bin/c++ && \
ln -sf clang++ /usr/bin/g++ && \
rm -rf /var/lib/apt/lists/*
END_DOCKERFILE
docker run -it --rm --user "$(id -u)" -v "$(pwd):/src" --workdir /src ansi2html-formatter "$@"
86 changes: 85 additions & 1 deletion src/iterm2_color_schemes/ansi_color_palette.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Generated by ./scripts/iterm2-color-schemes.pl from https://github.com/mbadolato/iTerm2-Color-Schemes/ at 92f20650771384b82f981fb0f249e5fbdcb69e9f
// Generated by ./scripts/iterm2-color-schemes.pl from https://github.com/mbadolato/iTerm2-Color-Schemes/ at 8b639f0c2605557bd23ba1b940842c67bbfd4ed0
#ifdef ITERM2_COLOR_SCHEMES
#include "../structs/ansi_color_palette.h"
// clang-format off
Expand Down Expand Up @@ -6863,6 +6863,34 @@ struct ansi_color_palette real_PALETTE_I2_PEPPERMINT = {
};
struct ansi_color_palette *PALETTE_I2_PEPPERMINT = &real_PALETTE_I2_PEPPERMINT;

// iTerm2-Color-Schemes/Xresources/Phala Green Dark: iTerm2 Color Schemes: Phala Green Dark -> i2_phala_green_dark
struct ansi_color_palette real_PALETTE_I2_PHALA_GREEN_DARK = {
"iTerm2 Color Schemes: Phala Green Dark",
{0x00, 0x00, 0x00},
{0xCD, 0xFA, 0x50},
{
{0x00, 0x00, 0x00},
{0x9D, 0x28, 0x14},
{0x4A, 0xAE, 0x31},
{0xA9, 0xA7, 0x33},
{0x0C, 0x23, 0xB8},
{0xB2, 0x3B, 0xBA},
{0x4B, 0xB1, 0xBD},
{0xCB, 0xCB, 0xCB},
},
{
{0x79, 0x79, 0x79},
{0xDA, 0x3B, 0x20},
{0x5D, 0xD8, 0x3F},
{0xE9, 0xE7, 0x4A},
{0x14, 0x32, 0xF5},
{0xDA, 0x4B, 0xE3},
{0x64, 0xE5, 0xE8},
{0xEA, 0xEA, 0xEA},
},
};
struct ansi_color_palette *PALETTE_I2_PHALA_GREEN_DARK = &real_PALETTE_I2_PHALA_GREEN_DARK;

// iTerm2-Color-Schemes/Xresources/Piatto Light: iTerm2 Color Schemes: Piatto Light -> i2_piatto_light
struct ansi_color_palette real_PALETTE_I2_PIATTO_LIGHT = {
"iTerm2 Color Schemes: Piatto Light",
Expand Down Expand Up @@ -8291,6 +8319,34 @@ struct ansi_color_palette real_PALETTE_I2_TANGO_HALF_ADAPTED = {
};
struct ansi_color_palette *PALETTE_I2_TANGO_HALF_ADAPTED = &real_PALETTE_I2_TANGO_HALF_ADAPTED;

// iTerm2-Color-Schemes/Xresources/Tearout: iTerm2 Color Schemes: Tearout -> i2_tearout
struct ansi_color_palette real_PALETTE_I2_TEAROUT = {
"iTerm2 Color Schemes: Tearout",
{0x34, 0x39, 0x2D},
{0xF4, 0xD2, 0xAE},
{
{0x68, 0x57, 0x42},
{0xCC, 0x96, 0x7B},
{0x97, 0x97, 0x6D},
{0x6C, 0x98, 0x61},
{0xB5, 0x95, 0x5E},
{0xC9, 0xA5, 0x54},
{0xD7, 0xC4, 0x83},
{0xB5, 0x95, 0x5E},
},
{
{0x68, 0x57, 0x42},
{0xCC, 0x96, 0x7B},
{0x97, 0x97, 0x6D},
{0x6C, 0x98, 0x61},
{0xB5, 0x95, 0x5E},
{0xC9, 0xA5, 0x54},
{0xD7, 0xC4, 0x83},
{0xB5, 0x95, 0x5E},
},
};
struct ansi_color_palette *PALETTE_I2_TEAROUT = &real_PALETTE_I2_TEAROUT;

// iTerm2-Color-Schemes/Xresources/Teerb: iTerm2 Color Schemes: Teerb -> i2_teerb
struct ansi_color_palette real_PALETTE_I2_TEERB = {
"iTerm2 Color Schemes: Teerb",
Expand Down Expand Up @@ -11455,6 +11511,34 @@ struct ansi_color_palette real_PALETTE_I2_VIMBONES = {
};
struct ansi_color_palette *PALETTE_I2_VIMBONES = &real_PALETTE_I2_VIMBONES;

// iTerm2-Color-Schemes/Xresources/violite: iTerm2 Color Schemes: violite -> i2_violite
struct ansi_color_palette real_PALETTE_I2_VIOLITE = {
"iTerm2 Color Schemes: violite",
{0x24, 0x1C, 0x36},
{0xEE, 0xF4, 0xF6},
{
{0x24, 0x1C, 0x36},
{0xEC, 0x79, 0x79},
{0x79, 0xEC, 0xB3},
{0xEC, 0xE2, 0x79},
{0xA9, 0x79, 0xEC},
{0xEC, 0x79, 0xEC},
{0x79, 0xEC, 0xEC},
{0xEE, 0xF4, 0xF6},
},
{
{0x49, 0x37, 0x6D},
{0xEF, 0x8F, 0x8F},
{0x9F, 0xEF, 0xBF},
{0xEF, 0xE7, 0x8F},
{0xB7, 0x8F, 0xEF},
{0xEF, 0x8F, 0xCF},
{0x9F, 0xEF, 0xEF},
{0xF8, 0xFA, 0xFC},
},
};
struct ansi_color_palette *PALETTE_I2_VIOLITE = &real_PALETTE_I2_VIOLITE;

// iTerm2-Color-Schemes/Xresources/wilmersdorf: iTerm2 Color Schemes: wilmersdorf -> i2_wilmersdorf
struct ansi_color_palette real_PALETTE_I2_WILMERSDORF = {
"iTerm2 Color Schemes: wilmersdorf",
Expand Down
5 changes: 4 additions & 1 deletion src/iterm2_color_schemes/ansi_color_palette.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Generated by ./scripts/iterm2-color-schemes.pl from https://github.com/mbadolato/iTerm2-Color-Schemes/ at 92f20650771384b82f981fb0f249e5fbdcb69e9f
// Generated by ./scripts/iterm2-color-schemes.pl from https://github.com/mbadolato/iTerm2-Color-Schemes/ at 8b639f0c2605557bd23ba1b940842c67bbfd4ed0
#ifdef ITERM2_COLOR_SCHEMES
#ifndef ITERM2_COLOR_SCHEMES_ANSI_COLOR_PALETTE_H_
#define ITERM2_COLOR_SCHEMES_ANSI_COLOR_PALETTE_H_
Expand Down Expand Up @@ -248,6 +248,7 @@ extern struct ansi_color_palette *PALETTE_I2_PAULMILLR;
extern struct ansi_color_palette *PALETTE_I2_PENCILDARK;
extern struct ansi_color_palette *PALETTE_I2_PENCILLIGHT;
extern struct ansi_color_palette *PALETTE_I2_PEPPERMINT;
extern struct ansi_color_palette *PALETTE_I2_PHALA_GREEN_DARK;
extern struct ansi_color_palette *PALETTE_I2_PIATTO_LIGHT;
extern struct ansi_color_palette *PALETTE_I2_PNEVMA;
extern struct ansi_color_palette *PALETTE_I2_POPPING_AND_LOCKING;
Expand Down Expand Up @@ -299,6 +300,7 @@ extern struct ansi_color_palette *PALETTE_I2_SYMFONIC;
extern struct ansi_color_palette *PALETTE_I2_SYNTHWAVEALPHA;
extern struct ansi_color_palette *PALETTE_I2_TANGO_ADAPTED;
extern struct ansi_color_palette *PALETTE_I2_TANGO_HALF_ADAPTED;
extern struct ansi_color_palette *PALETTE_I2_TEAROUT;
extern struct ansi_color_palette *PALETTE_I2_TEERB;
extern struct ansi_color_palette *PALETTE_I2_TERMINAL_BASIC;
extern struct ansi_color_palette *PALETTE_I2_TERMINAL_BASIC_DARK;
Expand Down Expand Up @@ -412,6 +414,7 @@ extern struct ansi_color_palette *PALETTE_I2_TOKYONIGHT_STORM;
extern struct ansi_color_palette *PALETTE_I2_TOKYONIGHT_MOON;
extern struct ansi_color_palette *PALETTE_I2_TOKYONIGHT_NIGHT;
extern struct ansi_color_palette *PALETTE_I2_VIMBONES;
extern struct ansi_color_palette *PALETTE_I2_VIOLITE;
extern struct ansi_color_palette *PALETTE_I2_WILMERSDORF;
extern struct ansi_color_palette *PALETTE_I2_XCODEDARK;
extern struct ansi_color_palette *PALETTE_I2_XCODEDARKHC;
Expand Down
5 changes: 4 additions & 1 deletion src/iterm2_color_schemes/named_palettes.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Generated by ./scripts/iterm2-color-schemes.pl from https://github.com/mbadolato/iTerm2-Color-Schemes/ at 92f20650771384b82f981fb0f249e5fbdcb69e9f
// Generated by ./scripts/iterm2-color-schemes.pl from https://github.com/mbadolato/iTerm2-Color-Schemes/ at 8b639f0c2605557bd23ba1b940842c67bbfd4ed0
#ifdef ITERM2_COLOR_SCHEMES
#ifndef ITERM2_COLOR_SCHEMES_NAMED_PALETTES_H_
#define ITERM2_COLOR_SCHEMES_NAMED_PALETTES_H_
Expand Down Expand Up @@ -248,6 +248,7 @@
{"i2_pencildark", PALETTE_I2_PENCILDARK },
{"i2_pencillight", PALETTE_I2_PENCILLIGHT },
{"i2_peppermint", PALETTE_I2_PEPPERMINT },
{"i2_phala_green_dark", PALETTE_I2_PHALA_GREEN_DARK },
{"i2_piatto_light", PALETTE_I2_PIATTO_LIGHT },
{"i2_pnevma", PALETTE_I2_PNEVMA },
{"i2_popping_and_locking", PALETTE_I2_POPPING_AND_LOCKING },
Expand Down Expand Up @@ -299,6 +300,7 @@
{"i2_synthwavealpha", PALETTE_I2_SYNTHWAVEALPHA },
{"i2_tango_adapted", PALETTE_I2_TANGO_ADAPTED },
{"i2_tango_half_adapted", PALETTE_I2_TANGO_HALF_ADAPTED },
{"i2_tearout", PALETTE_I2_TEAROUT },
{"i2_teerb", PALETTE_I2_TEERB },
{"i2_terminal_basic", PALETTE_I2_TERMINAL_BASIC },
{"i2_terminal_basic_dark", PALETTE_I2_TERMINAL_BASIC_DARK },
Expand Down Expand Up @@ -412,6 +414,7 @@
{"i2_tokyonight_moon", PALETTE_I2_TOKYONIGHT_MOON },
{"i2_tokyonight_night", PALETTE_I2_TOKYONIGHT_NIGHT },
{"i2_vimbones", PALETTE_I2_VIMBONES },
{"i2_violite", PALETTE_I2_VIOLITE },
{"i2_wilmersdorf", PALETTE_I2_WILMERSDORF },
{"i2_xcodedark", PALETTE_I2_XCODEDARK },
{"i2_xcodedarkhc", PALETTE_I2_XCODEDARKHC },
Expand Down
Loading
Loading