glyph-util: add more emojis

diff --git a/src/basic/glyph-util.c b/src/basic/glyph-util.c
index 5b4e32f35a1c5233710a610af36829a3e395e69a..f540a68473166878d30d8c6e96ecf552732a7429 100644 (file)
--- a/src/basic/glyph-util.c
+++ b/src/basic/glyph-util.c
@@ -88,6 +88,12 @@ const char* glyph_full(Glyph code, bool force_utf) {
                         [GLYPH_SUPERHERO]               = "S",
                         [GLYPH_IDCARD]                  = "@",
                         [GLYPH_HOME]                    = "^",
+                        [GLYPH_ROCKET]                  = "^",
+                        [GLYPH_BROOM]                   = "/",
+                        [GLYPH_KEYBOARD]                = "K",
+                        [GLYPH_CLOCK]                   = "O",
+                        [GLYPH_LABEL]                   = "L",
+                        [GLYPH_SHELL]                   = "$",
                 },
 
                 /* UTF-8 */
@@ -155,7 +161,6 @@ const char* glyph_full(Glyph code, bool force_utf) {
                         [GLYPH_WARNING_SIGN]            = UTF8("⚠️"),
                         [GLYPH_COMPUTER_DISK]           = UTF8("💽"),
                         [GLYPH_WORLD]                   = UTF8("🌍"),
-
                         [GLYPH_RED_CIRCLE]              = UTF8("🔴"),
                         [GLYPH_YELLOW_CIRCLE]           = UTF8("🟡"),
                         [GLYPH_BLUE_CIRCLE]             = UTF8("🔵"),
@@ -163,6 +168,12 @@ const char* glyph_full(Glyph code, bool force_utf) {
                         [GLYPH_SUPERHERO]               = UTF8("🦸"),
                         [GLYPH_IDCARD]                  = UTF8("🪪"),
                         [GLYPH_HOME]                    = UTF8("🏠"),
+                        [GLYPH_ROCKET]                  = UTF8("🚀"),
+                        [GLYPH_BROOM]                   = UTF8("🧹"),
+                        [GLYPH_KEYBOARD]                = UTF8("⌨️"),
+                        [GLYPH_CLOCK]                   = UTF8("🕗"),
+                        [GLYPH_LABEL]                   = UTF8("🏷️"),
+                        [GLYPH_SHELL]                   = UTF8("🐚"),
                 },
         };
 

diff --git a/src/basic/glyph-util.h b/src/basic/glyph-util.h
index b1c90d00f6a89ee4950f3653e3096fa934777521..92b325726b6bfed327a60053f5e3d4cad5e440a2 100644 (file)
--- a/src/basic/glyph-util.h
+++ b/src/basic/glyph-util.h
@@ -56,6 +56,12 @@ typedef enum Glyph {
         GLYPH_SUPERHERO,
         GLYPH_IDCARD,
         GLYPH_HOME,
+        GLYPH_ROCKET,
+        GLYPH_BROOM,
+        GLYPH_KEYBOARD,
+        GLYPH_CLOCK,
+        GLYPH_LABEL,
+        GLYPH_SHELL,
         _GLYPH_MAX,
         _GLYPH_INVALID = -EINVAL,
 } Glyph;

diff --git a/src/test/test-locale-util.c b/src/test/test-locale-util.c
index e264cff5ddde13a4fcda68e3f40b1c10d7cecd89..53ab3fcb810bcab4c9337621399cfbece5be4c1e 100644 (file)
--- a/src/test/test-locale-util.c
+++ b/src/test/test-locale-util.c
@@ -81,7 +81,7 @@ TEST(keymaps) {
 
 #define dump_glyph(x) log_info(STRINGIFY(x) ": %s", glyph(x))
 TEST(dump_glyphs) {
-        assert_cc(GLYPH_HOME + 1 == _GLYPH_MAX);
+        assert_cc(GLYPH_SHELL + 1 == _GLYPH_MAX);
 
         log_info("is_locale_utf8: %s", yes_no(is_locale_utf8()));
 
@@ -135,6 +135,12 @@ TEST(dump_glyphs) {
         dump_glyph(GLYPH_SUPERHERO);
         dump_glyph(GLYPH_IDCARD);
         dump_glyph(GLYPH_HOME);
+        dump_glyph(GLYPH_ROCKET);
+        dump_glyph(GLYPH_BROOM);
+        dump_glyph(GLYPH_KEYBOARD);
+        dump_glyph(GLYPH_CLOCK);
+        dump_glyph(GLYPH_LABEL);
+        dump_glyph(GLYPH_SHELL);
 }
 
 DEFINE_TEST_MAIN(LOG_INFO);