Use perfect hash (gperf) for parsing color names (#1848)

Signed-off-by: Tin Švagelj <[email protected]>
brndnmtthws · Apr 24, 2024 · 93ffab5 · 93ffab5
1 parent 6adf6b9
commit 93ffab5
Show file tree

Hide file tree

Showing 16 changed files with 865 additions and 1,659 deletions.
diff --git a/.github/workflows/build-and-test-linux.yaml b/.github/workflows/build-and-test-linux.yaml
@@ -84,6 +84,7 @@ jobs:
             audacious-dev \
             cmake \
             gawk \
+            gperf \
             lcov \
             libaudclient-dev \
             libcairo2-dev \

diff --git a/.github/workflows/build-and-test-macos.yaml b/.github/workflows/build-and-test-macos.yaml
@@ -37,6 +37,7 @@ jobs:
             freetype \
             gettext \
             imlib2 \
+            gperf \
             lcov \
             librsvg \
             libxft \

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -31,6 +31,7 @@ jobs:
             audacious-dev \
             cmake \
             gawk \
+            gperf \
             lcov \
             libaudclient-dev \
             libc++-14-dev \

diff --git a/.github/workflows/publish-appimage.yml b/.github/workflows/publish-appimage.yml
@@ -38,6 +38,7 @@ jobs:
             audacious-dev \
             cmake \
             gawk \
+            gperf \
             lcov \
             libaudclient-dev \
             libcairo2-dev \

diff --git a/.gitignore b/.gitignore
@@ -16,12 +16,14 @@ cmake_uninstall.cmake
 CPackConfig.cmake
 CPackSourceConfig.cmake
 
+# Generated files
 data/convertconf.h
 data/defconfig.h
 *.so
 *.a
 /config.h
 /build.h
+src/colour-names.cc
 
 # Compiler cache
 .cache

diff --git a/bin/format-colors.sh b/bin/format-colors.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+# Prepares stdin input YAML for gperf consumption
+
+echo "struct rgb { const char *name; uint8_t red; uint8_t green; uint8_t blue; };"
+echo "%%"
+tr -d '[]"' | tr ":" ","
diff --git a/cmake/Conky.cmake b/cmake/Conky.cmake
@@ -153,6 +153,8 @@ if(NOT APP_UNAME)
   message(FATAL_ERROR "Unable to find program 'uname'")
 endif(NOT APP_UNAME)
 
+find_program(APP_GPERF gperf)
+
 if(NOT RELEASE)
   find_program(APP_GIT git)
 
@@ -163,7 +165,7 @@ if(NOT RELEASE)
   mark_as_advanced(APP_GIT)
 endif(NOT RELEASE)
 
-mark_as_advanced(APP_AWK APP_WC APP_UNAME)
+mark_as_advanced(APP_AWK APP_WC APP_UNAME APP_GPERF)
 
 execute_process(COMMAND ${APP_UNAME} -sm
   RESULT_VARIABLE RETVAL