diff options
| -rw-r--r-- | CMakeLists.txt | 12 | ||||
| -rw-r--r-- | LICENSE | 2 | ||||
| -rw-r--r-- | README.adoc | 3 | ||||
| -rw-r--r-- | ddc-ci.c | 2 | ||||
| -rw-r--r-- | genpass.c | 151 | ||||
| -rw-r--r-- | liust-50/README.adoc | 18 | ||||
| -rw-r--r-- | liust-50/charset/charset.go | 211 | ||||
| -rw-r--r-- | liust-50/charset/germany.png | bin | 0 -> 1204 bytes | |||
| -rw-r--r-- | liust-50/charset/international.png | bin | 0 -> 805 bytes | |||
| -rw-r--r-- | liust-50/charset/japan.png | bin | 0 -> 1194 bytes | |||
| -rw-r--r-- | liust-50/cmd/liustatus/status.go | 208 | ||||
| -rw-r--r-- | liust-50/cmd/liustatus/weather.go | 132 | ||||
| -rw-r--r-- | liust-50/cmd/liustsim/simulator.go | 325 | ||||
| -rw-r--r-- | liust-50/go.mod | 40 | ||||
| -rw-r--r-- | liust-50/go.sum | 80 | ||||
| -rw-r--r-- | wmstatus.c | 17 | ||||
| -rw-r--r-- | wmstatus.conf.example | 3 |
17 files changed, 1188 insertions, 16 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index f1d4292..233ebde 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -25,7 +25,7 @@ include_directories ( link_directories ( ${x_LIBRARY_DIRS} ${pulse_LIBRARY_DIRS} ${dbus_LIBRARY_DIRS}) -option (WITH_GDM "Compile with GDM support" ${gdm_FOUND}) +option (WITH_GDM "Compile with GDM utilities" ${gdm_FOUND}) # Generate a configuration file configure_file (${PROJECT_SOURCE_DIR}/config.h.in @@ -33,7 +33,7 @@ configure_file (${PROJECT_SOURCE_DIR}/config.h.in include_directories (${PROJECT_BINARY_DIR}) # Build -set (targets wmstatus paswitch siprandom) +set (targets wmstatus paswitch siprandom genpass) if ("${CMAKE_SYSTEM_NAME}" STREQUAL Linux) # These use Linux i2c APIs, but can be made to work on macOS list (APPEND targets brightness input-switch) @@ -58,9 +58,10 @@ target_link_libraries (wmstatus add_threads (wmstatus) if (WITH_GDM) - include_directories (${gdm_INCLUDE_DIRS}) - link_directories (${gdm_LIBRARY_DIRS}) + list (APPEND targets gdm-switch-user) add_executable (gdm-switch-user gdm-switch-user.c) + target_include_directories (gdm-switch-user PUBLIC ${gdm_INCLUDE_DIRS}) + target_link_directories (gdm-switch-user PUBLIC ${gdm_LIBRARY_DIRS}) target_link_libraries (gdm-switch-user ${gdm_LIBRARIES}) endif () @@ -95,6 +96,7 @@ endif () # These should be accessible by users, but need to touch system devices. # Use the setuid bit, for simplicity. +set (SETUID "SETUID" CACHE STRING "Set this empty on permission issues") foreach (target brightness input-switch) if (${target} IN_LIST targets) list (REMOVE_ITEM targets ${target}) @@ -103,7 +105,7 @@ foreach (target brightness input-switch) OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE - SETUID) + ${SETUID}) endif () endforeach () @@ -1,4 +1,4 @@ -Copyright (c) 2015 - 2024, Přemysl Eric Janouch <p@janouch.name> +Copyright (c) 2015 - 2025, Přemysl Eric Janouch <p@janouch.name> Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted. diff --git a/README.adoc b/README.adoc index 0bd0de4..9f2b5f4 100644 --- a/README.adoc +++ b/README.adoc @@ -37,7 +37,8 @@ Regular releases are sporadic. git master should be stable enough. Building -------- Build dependencies: CMake, pkg-config, liberty (included) + -Runtime dependencies: libpulse, libx11, dbus-1, libgdm (optional) +Runtime dependencies: libpulse, libx11, dbus-1 + +Optional runtime dependencies: libgdm (gdm-switch-user) $ git clone --recursive https://git.janouch.name/p/desktop-tools.git $ mkdir desktop-tools/build @@ -46,7 +46,7 @@ log_message_custom (void *user_data, const char *quote, const char *fmt, static void wait_ms (long ms) { - struct timespec ts = { 0, ms * 1000 * 1000 }; + struct timespec ts = { ms / 1000, (ms % 1000) * 1000 * 1000 }; nanosleep (&ts, NULL); } diff --git a/genpass.c b/genpass.c new file mode 100644 index 0000000..623eecb --- /dev/null +++ b/genpass.c @@ -0,0 +1,151 @@ +/* + * genpass.c: password generator + * + * Copyright (c) 2025, Přemysl Eric Janouch <p@janouch.name> + * + * Permission to use, copy, modify, and/or distribute this software for any + * purpose with or without fee is hereby granted. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY + * SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION + * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN + * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + * + */ + +#include "config.h" +#undef PROGRAM_NAME +#define PROGRAM_NAME "genpass" +#include "liberty/liberty.c" + +static struct str +parse_group (const char *group) +{ + bool present[0x100] = {}; + for (size_t i = 0; group[i]; i++) + { + unsigned char c = group[i]; + if (!i || c != '-' || !group[i + 1]) + present[c] = true; + else if (group[i + 1] < group[i - 1]) + exit_fatal ("character ranges must be increasing"); + else + for (c = group[i - 1]; ++c <= group[i + 1]; ) + present[c] = true; + } + + struct str alphabet = str_make (); + for (size_t i = 1; i < N_ELEMENTS (present); i++) + if (present[i]) + str_append_c (&alphabet, i); + if (!alphabet.len) + exit_fatal ("empty group"); + return alphabet; +} + +static void +parse_program_arguments (int argc, char **argv, + unsigned long *length, struct strv *groups, struct str *alphabet) +{ + static const struct opt opts[] = + { + { 'l', "length", "CHARACTERS", 0, "set password length" }, + { 'd', "debug", NULL, 0, "run in debug mode" }, + { 'h', "help", NULL, 0, "display this help and exit" }, + { 'V', "version", NULL, 0, "output version information and exit" }, + { 0, NULL, NULL, 0, NULL } + }; + + struct opt_handler oh = + opt_handler_make (argc, argv, opts, "GROUP...", "Password generator."); + + int c; + while ((c = opt_handler_get (&oh)) != -1) + switch (c) + { + case 'l': + if (!xstrtoul (length, optarg, 10) || *length <= 0) + print_fatal ("invalid length argument"); + break; + case 'd': + g_debug_mode = true; + break; + case 'h': + opt_handler_usage (&oh, stdout); + exit (EXIT_SUCCESS); + case 'V': + printf (PROGRAM_NAME " " PROGRAM_VERSION "\n"); + exit (EXIT_SUCCESS); + default: + print_error ("wrong options"); + opt_handler_usage (&oh, stderr); + exit (EXIT_FAILURE); + } + + argc -= optind; + argv += optind; + + for (int i = 0; i < argc; i++) + { + struct str alphabet = parse_group (argv[i]); + strv_append_owned (groups, str_steal (&alphabet)); + } + + bool present[0x100] = {}; + for (size_t i = 0; i < groups->len; i++) + for (size_t k = 0; groups->vector[i][k]; k++) + { + unsigned char c = groups->vector[i][k]; + if (present[c]) + exit_fatal ("groups are not disjunct"); + present[c] = true; + } + for (size_t i = 1; i < N_ELEMENTS (present); i++) + if (present[i]) + str_append_c (alphabet, i); + + if (groups->len > *length) + exit_fatal ("the requested length is less than the number of groups"); + if (!groups->len) + { + opt_handler_usage (&oh, stderr); + exit (EXIT_FAILURE); + } + + opt_handler_free (&oh); +} + +int +main (int argc, char *argv[]) +{ + unsigned long length = 8; + struct strv groups = strv_make (); + struct str alphabet = str_make (); + parse_program_arguments (argc, argv, &length, &groups, &alphabet); + + unsigned seed = 0; + if (!random_bytes (&seed, sizeof seed, NULL)) + exit_fatal ("failed to initialize random numbers"); + srand (seed); + + // Select from a joined alphabet, but make sure all groups are represented. + struct str candidate = str_make (); + while (true) + { +restart: + for (size_t i = length; i--; ) + str_append_c (&candidate, alphabet.str[rand () % alphabet.len]); + for (size_t i = 0; i < groups.len; i++) + if (!strpbrk (candidate.str, groups.vector[i])) + { + str_reset (&candidate); + goto restart; + } + + printf ("%s\n", candidate.str); + return 0; + } +} diff --git a/liust-50/README.adoc b/liust-50/README.adoc new file mode 100644 index 0000000..0ffeaaf --- /dev/null +++ b/liust-50/README.adoc @@ -0,0 +1,18 @@ +LIUST-50 +======== + +Included here are a simulator for the Toshiba Tec LIUST-A00 (LIUST-50) +VFD line display, and a status program sending data to the device. + +For device documentation, see https://github.com/boricha/M202MD12D which is +seemingly a project for the later LIUST-A10. + +Device setup +------------ + # stty -F /dev/ttyS0 9600 parenb oddp -crtscts -cstopb cs8 + +Running +------- + # liustatus > /dev/ttyS0 + + $ liustatus | liustsim diff --git a/liust-50/charset/charset.go b/liust-50/charset/charset.go new file mode 100644 index 0000000..61196d6 --- /dev/null +++ b/liust-50/charset/charset.go @@ -0,0 +1,211 @@ +package charset + +import ( + "bytes" + _ "embed" + "image" + _ "image/png" + "log" +) + +// Charsets are loosely based on CP 437 and JIS X 0201. + +var runesJapan2 = [256]rune{ + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + 0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, + 0x28, 0x29, 0x2A, 0x2B, 0x2C, 0x2D, 0x2E, 0x2F, + 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, + 0x38, 0x39, 0x3A, 0x3B, 0x3C, 0x3D, 0x3E, 0x3F, + 0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, + 0x48, 0x49, 0x4A, 0x4B, 0x4C, 0x4D, 0x4E, 0x4F, + 0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57, + 0x58, 0x59, 0x5A, 0x5B, '¥', 0x5D, 0x5E, 0x5F, + 0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, + 0x68, 0x69, 0x6A, 0x6B, 0x6C, 0x6D, 0x6E, 0x6F, + 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, + 0x78, 0x79, 0x7A, 0x7B, 0x7C, 0x7D, 0x7E, '⌂', + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + '▒', '｡', '｢', '｣', '､', '･', 'ｦ', 'ｧ', + 'ｨ', 'ｩ', 'ｪ', 'ｫ', 'ｬ', 'ｭ', 'ｮ', 'ｯ', + 'ｰ', 'ｱ', 'ｲ', 'ｳ', 'ｴ', 'ｵ', 'ｶ', 'ｷ', + 'ｸ', 'ｹ', 'ｺ', 'ｻ', 'ｼ', 'ｽ', 'ｾ', 'ｿ', + 'ﾀ', 'ﾁ', 'ﾂ', 'ﾃ', 'ﾄ', 'ﾅ', 'ﾆ', 'ﾇ', + 'ﾈ', 'ﾉ', 'ﾊ', 'ﾋ', 'ﾌ', 'ﾍ', 'ﾎ', 'ﾏ', + 'ﾐ', 'ﾑ', 'ﾒ', 'ﾓ', 'ﾔ', 'ﾕ', 'ﾖ', 'ﾗ', + 'ﾘ', 'ﾙ', 'ﾚ', 'ﾛ', 'ﾜ', 'ﾝ', 'ﾞ', 'ﾟ', + 'α', 'ß', 'Γ', 'π', 'Σ', 'σ', 'µ', 'τ', + 'Φ', 'Θ', 'Ω', 'δ', '∞', 'φ', 'ε', '∩', + '→', '←', '↓', '↑', '½', '¼', '★', '◊', + '㎏', '℔', '�', '×', '▾', '▴', '日', ' ', +} + +var runesInternational = [256]rune{ + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + 0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, + 0x28, 0x29, 0x2A, 0x2B, 0x2C, 0x2D, 0x2E, 0x2F, + 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, + 0x38, 0x39, 0x3A, 0x3B, 0x3C, 0x3D, 0x3E, 0x3F, + 0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, + 0x48, 0x49, 0x4A, 0x4B, 0x4C, 0x4D, 0x4E, 0x4F, + 0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57, + 0x58, 0x59, 0x5A, 0x5B, 0x5C, 0x5D, 0x5E, 0x5F, + 0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, + 0x68, 0x69, 0x6A, 0x6B, 0x6C, 0x6D, 0x6E, 0x6F, + 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, + 0x78, 0x79, 0x7A, 0x7B, 0x7C, 0x7D, 0x7E, '⌂', + 'Ç', 'ü', 'é', 'â', 'ä', 'à', 'å', 'ç', + 'ê', 'ë', 'è', 'ï', 'î', 'ì', 'Ä', 'Å', + 'É', 'æ', 'Æ', 'ô', 'ö', 'ò', 'û', 'ù', + 'ÿ', 'Ö', 'Ü', '¢', '£', '¥', '₧', 'ƒ', + 'á', 'í', 'ó', 'ú', 'ñ', 'Ñ', 'ª', 'º', + '¿', '⌐', '¬', '½', '¼', '¡', '«', '»', + '░', '▒', '▓' - 1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, '█', '▄', '▌', '▐', '▀', + 'α', 'ß', 'Γ', 'π', 'Σ', 'σ', 'µ', 'τ', + 'Φ', 'Θ', 'Ω', 'δ', '∞', 'φ', 'ε', '∩', + '≡', '±', '≥', '≤', '⌠', '⌡', '÷', '≈', + '°', '∙', '·', '√', 'ⁿ', '²', '■', ' ', +} + +var runesInternationalVariants = []string{ + "#$@[\\]^`{|}~", // USA + "#$à·ç§^`éùè╍", // France + "#$§ÄÖÜ^`äöüß", // Germany + "£$@[\\]^`{|}~", // UK + "#$@ÆØÅ^`æøå~", // Denmark 1 + "#¤ÉÄÖÅÜéäöåü", // Sweden + "#$@·\\é^ùàòèì", // Italy + "₧$@¡Ñ¿^`╍ñ}~", // Spain + "#$@[¥]^`{|}~", // Japan + "#¤ÉÆØÅÜéæøåü", // Norway + "#$ÉÆØÅÜéæøåü", // Denmark 2 + "#$á¡Ñ¿é`íñóú", // Spain 2 + "#$á¡Ñ¿éüíñóú", // Latin America +} + +var internationalVariantsChars = []byte{ + 0x23, 0x24, 0x40, 0x5B, 0x5C, 0x5D, 0x5E, 0x60, 0x7B, 0x7C, 0x7D, 0x7E} + +// ResolveCharToRune tries to decode a character into a Unicode rune. +// It may return rune(-1) if the character is deemed to have no representation. +func ResolveCharToRune(char, charset uint8) rune { + if charset == 0x63 { + return runesJapan2[char] + } + if int(charset) >= len(runesInternationalVariants) { + return -1 + } + + for i, b := range internationalVariantsChars { + if char == b { + return []rune(runesInternationalVariants[charset])[i] + } + } + return runesInternational[char] +} + +// ResolveRune tries to find a corresponding character for a Unicode rune. +func ResolveRune(r rune, charset uint8) (uint8, bool) { + if charset == 0x63 { + for i, ch := range runesJapan2 { + if ch == r { + return uint8(i), true + } + } + return 0, false + } + if int(charset) >= len(runesInternationalVariants) { + return 0, false + } + + variantRunes := []rune(runesInternationalVariants[charset]) + for i, ch := range variantRunes { + if ch == r { + return internationalVariantsChars[i], true + } + } + for i, ch := range runesInternational { + if ch == r { + return uint8(i), true + } + } + return 0, false +} + +//go:embed japan.png +var pngJapan2 []byte +var imageJapan2 image.Image + +//go:embed germany.png +var pngGermany []byte +var imageGermany image.Image + +//go:embed international.png +var pngInternational []byte +var imageInternational image.Image + +func init() { + var err error + imageJapan2, _, err = image.Decode(bytes.NewReader(pngJapan2)) + if err != nil { + log.Fatalln(err) + } + + imageGermany, _, err = image.Decode(bytes.NewReader(pngGermany)) + if err != nil { + log.Fatalln(err) + } + + imageInternational, _, err = image.Decode(bytes.NewReader(pngInternational)) + if err != nil { + log.Fatalln(err) + } +} + +// ResolveCharToImage tries to decode a character into a 5x7 bitmap image +// (white on black). +func ResolveCharToImage(char, charset uint8) image.Image { + const ( + gridWidth = 6 + gridHeight = 8 + ) + + var src image.Image + var col, row int + if charset == 0x63 { + src, col, row = imageJapan2, int(char)/16, int(char)%16 + } else if int(charset) < len(runesInternationalVariants) { + src, col, row = imageGermany, int(char)/16, int(char)%16 + for i, b := range internationalVariantsChars { + if char == b { + src, col, row = imageInternational, i, int(charset) + } + } + } else { + return nil + } + + x0 := col * gridWidth + y0 := row * gridHeight + return src.(interface { + SubImage(r image.Rectangle) image.Image + }).SubImage(image.Rect( + x0, + y0, + x0+gridWidth-1, + y0+gridHeight-1, + )) +} diff --git a/liust-50/charset/germany.png b/liust-50/charset/germany.png Binary files differnew file mode 100644 index 0000000..851f065 --- /dev/null +++ b/liust-50/charset/germany.png diff --git a/liust-50/charset/international.png b/liust-50/charset/international.png Binary files differnew file mode 100644 index 0000000..b230a94 --- /dev/null +++ b/liust-50/charset/international.png diff --git a/liust-50/charset/japan.png b/liust-50/charset/japan.png Binary files differnew file mode 100644 index 0000000..48260d8 --- /dev/null +++ b/liust-50/charset/japan.png diff --git a/liust-50/cmd/liustatus/status.go b/liust-50/cmd/liustatus/status.go new file mode 100644 index 0000000..50ec065 --- /dev/null +++ b/liust-50/cmd/liustatus/status.go @@ -0,0 +1,208 @@ +package main + +import ( + "fmt" + "os" + "strings" + "time" + + "janouch.name/desktop-tools/liust-50/charset" +) + +// TODO(p): Make more elaberate animations with these. +var kaomoji = []struct { + kao, message string +}{ + {"(o_o)", ""}, + {"(ﾟﾛﾟ)", ""}, + {"(ﾟ∩ﾟ)", ""}, + {"(^_^)", ""}, + {" (^_^)", ""}, + {"(^_^) ", ""}, + {"(x_x)", "ｽﾞｷｽﾞｷ"}, + {"(T_T)", "ｽﾞｰﾝ"}, + {"=^.^=", "ﾆｬｰ"}, + {"(>_<)", "ｹﾞｯﾌﾟ"}, + {"(O_O)", "ｼﾞｰ"}, + {"(-_-)", ""}, + {"(-_-)", "ｸﾞｰｸﾞｰ"}, + {"(o_-)", ""}, + {"(-_o)", ""}, +} + +// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + +const ( + displayWidth = 20 + displayHeight = 2 + targetCharset = 0x63 +) + +type DisplayState struct { + Display [displayHeight][displayWidth]uint8 +} + +type Display struct { + Current, Last DisplayState +} + +func NewDisplay() *Display { + t := &Display{} + for y := 0; y < displayHeight; y++ { + for x := 0; x < displayWidth; x++ { + t.Current.Display[y][x] = ' ' + t.Last.Display[y][x] = ' ' + } + } + return t +} + +func (t *Display) SetLine(row int, content string) { + if row < 0 || row >= displayHeight { + return + } + + runes := []rune(content) + for x := 0; x < displayWidth; x++ { + if x < len(runes) { + b, ok := charset.ResolveRune(runes[x], targetCharset) + if ok { + t.Current.Display[row][x] = b + } else { + t.Current.Display[row][x] = '?' + } + } else { + t.Current.Display[row][x] = ' ' + } + } +} + +func (t *Display) HasChanges() bool { + for y := 0; y < displayHeight; y++ { + for x := 0; x < displayWidth; x++ { + if t.Current.Display[y][x] != t.Last.Display[y][x] { + return true + } + } + } + return false +} + +func (t *Display) Update() { + for y := 0; y < displayHeight; y++ { + x := 0 + for x < displayWidth { + if t.Current.Display[y][x] == t.Last.Display[y][x] { + x++ + continue + } + + startX := x + var changes strings.Builder + for x < displayWidth && + t.Current.Display[y][x] != t.Last.Display[y][x] { + changes.WriteByte(t.Current.Display[y][x]) + t.Last.Display[y][x] = t.Current.Display[y][x] + x++ + } + + fmt.Printf("\x1b[%d;%dH%s", y+1, startX+1, changes.String()) + } + } + + os.Stdout.Sync() +} + +func centerText(text string, width int) string { + textLen := len([]rune(text)) + if textLen >= width { + return text[:width] + } + leftPad := (width - textLen + 1) / 2 + rightPad := width - textLen - leftPad + return strings.Repeat(" ", leftPad) + text + strings.Repeat(" ", rightPad) +} + +func kaomojiProducer(lines chan<- string) { + ticker := time.NewTicker(30_000 * time.Millisecond) + defer ticker.Stop() + + idx := 0 + for { + km := kaomoji[idx] + + line := centerText(km.kao, displayWidth) + if km.message != "" { + line = line[:14] + km.message + line += strings.Repeat(" ", displayWidth-len([]rune(line))) + } + + lines <- line + + idx = (idx + 1) % len(kaomoji) + <-ticker.C + } +} + +func statusProducer(lines chan<- string) { + ticker := time.NewTicker(1 * time.Second) + defer ticker.Stop() + + temperature, fetcher := "", NewWeatherFetcher() + temperatureChan := make(chan string) + go fetcher.Run(5*time.Minute, temperatureChan) + + for { + select { + case newTemperature := <-temperatureChan: + temperature = newTemperature + default: + } + + now := time.Now() + status := fmt.Sprintf("%s %3s %s", + now.Format("Mon _2 Jan"), temperature, now.Format("15:04")) + + // Ensure exactly 20 characters. + runes := []rune(status) + if len(runes) > displayWidth { + status = string(runes[:displayWidth]) + } else if len(runes) < displayWidth { + status = status + strings.Repeat(" ", displayWidth-len(runes)) + } + + lines <- status + <-ticker.C + } +} + +func main() { + terminal := NewDisplay() + + kaomojiChan := make(chan string, 1) + statusChan := make(chan string, 1) + + go kaomojiProducer(kaomojiChan) + go statusProducer(statusChan) + + // TODO(p): And we might want to disable cursor visibility as well. + fmt.Printf("\x1bR%c", targetCharset) + fmt.Print("\x1b[2J") // Clear display + + go func() { + kaomojiChan <- centerText(kaomoji[0].kao, displayWidth) + statusChan <- strings.Repeat(" ", displayWidth) + }() + + for { + select { + case line := <-kaomojiChan: + terminal.SetLine(0, line) + case line := <-statusChan: + terminal.SetLine(1, line) + } + if terminal.HasChanges() { + terminal.Update() + } + } +} diff --git a/liust-50/cmd/liustatus/weather.go b/liust-50/cmd/liustatus/weather.go new file mode 100644 index 0000000..c744f2f --- /dev/null +++ b/liust-50/cmd/liustatus/weather.go @@ -0,0 +1,132 @@ +package main + +import ( + "encoding/xml" + "fmt" + "io" + "log" + "net/http" + "strconv" + "time" +) + +const ( + baseURL = "https://api.met.no/weatherapi" + userAgent = "liustatus/1.0" + + // Prague coordinates. + lat = 50.08804 + lon = 14.42076 + altitude = 202 +) + +// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + +type Weatherdata struct { + XMLName xml.Name `xml:"weatherdata"` + Product Product `xml:"product"` +} + +type Product struct { + Times []Time `xml:"time"` +} + +type Time struct { + From string `xml:"from,attr"` + To string `xml:"to,attr"` + Location Location `xml:"location"` +} + +type Location struct { + Temperature *Temperature `xml:"temperature"` +} + +type Temperature struct { + Unit string `xml:"unit,attr"` + Value string `xml:"value,attr"` +} + +// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + +// WeatherFetcher handles weather data retrieval. +type WeatherFetcher struct { + client *http.Client +} + +// NewWeatherFetcher creates a new weather fetcher instance. +func NewWeatherFetcher() *WeatherFetcher { + return &WeatherFetcher{ + client: &http.Client{Timeout: 30 * time.Second}, + } +} + +// fetchWeather retrieves the current temperature from the API. +func (w *WeatherFetcher) fetchWeather() (string, error) { + url := fmt.Sprintf( + "%s/locationforecast/2.0/classic?lat=%.5f&lon=%.5f&altitude=%d", + baseURL, lat, lon, altitude) + + req, err := http.NewRequest("GET", url, nil) + if err != nil { + return "", err + } + + req.Header.Set("User-Agent", userAgent) + + resp, err := w.client.Do(req) + if err != nil { + return "", err + } + defer resp.Body.Close() + + if resp.StatusCode != http.StatusOK { + return "", fmt.Errorf("API returned status %d", resp.StatusCode) + } + + body, err := io.ReadAll(resp.Body) + if err != nil { + return "", err + } + + var weatherData Weatherdata + if err := xml.Unmarshal(body, &weatherData); err != nil { + return "", err + } + + now := time.Now().UTC() + for _, t := range weatherData.Product.Times { + toTime, err := time.Parse("2006-01-02T15:04:05Z", t.To) + if err != nil || toTime.Before(now) { + continue + } + if t.Location.Temperature != nil { + temp, err := strconv.ParseFloat(t.Location.Temperature.Value, 64) + if err != nil { + continue + } + return fmt.Sprintf("%dﾟ", int(temp)), nil + } + } + + return "", fmt.Errorf("no usable temperature data found") +} + +// update fetches new weather data and returns it. +func (w *WeatherFetcher) update() string { + temp, err := w.fetchWeather() + if err != nil { + log.Printf("Error fetching weather: %v", err) + } + return temp +} + +// Run runs as a goroutine to periodically fetch weather data. +func (w *WeatherFetcher) Run(interval time.Duration, output chan<- string) { + ticker := time.NewTicker(interval) + defer ticker.Stop() + + output <- w.update() + for range ticker.C { + output <- w.update() + } +} diff --git a/liust-50/cmd/liustsim/simulator.go b/liust-50/cmd/liustsim/simulator.go new file mode 100644 index 0000000..2ad69a8 --- /dev/null +++ b/liust-50/cmd/liustsim/simulator.go @@ -0,0 +1,325 @@ +package main + +import ( + "bufio" + "image" + "image/color" + "os" + "strconv" + "strings" + + "fyne.io/fyne/v2" + "fyne.io/fyne/v2/app" + "fyne.io/fyne/v2/canvas" + + "janouch.name/desktop-tools/liust-50/charset" +) + +const ( + displayWidth = 20 + displayHeight = 2 + charWidth = 5 + 1 + charHeight = 7 + 1 + magnification = 5 +) + +// TODO(p): See how this works exactly, and implement it. +const ( + cursorModeOff = iota + cursorModeBlink + cursorModeLightUp +) + +type Display struct { + image *canvas.Image + chars [displayHeight][displayWidth]uint8 + charset uint8 + cursorX int + cursorY int + cursorMode int +} + +func NewDisplay() *Display { + return &Display{charset: 2} +} + +func (d *Display) Clear() { + for y := 0; y < displayHeight; y++ { + for x := 0; x < displayWidth; x++ { + d.chars[y][x] = 0x20 // space + } + } +} + +func (d *Display) ClearToEnd() { + for x := d.cursorX; x < displayWidth; x++ { + d.chars[d.cursorY][x] = 0x20 // space + } +} + +func (d *Display) drawCharacter( + img *image.RGBA, charImg image.Image, cx, cy int) { + if charImg == nil { + return + } + + bounds := charImg.Bounds() + width, height := bounds.Dx(), bounds.Dy() + for dy := 0; dy < height; dy++ { + for dx := 0; dx < width; dx++ { + c := charImg.At(bounds.Min.X+dx, bounds.Min.Y+dy) + if r, _, _, _ := c.RGBA(); r >= 0x8000 { + c = color.RGBA{0x00, 0xFF, 0xC0, 0xFF} + } else { + c = color.RGBA{0x20, 0x20, 0x20, 0xFF} + } + img.Set(1+cx*charWidth+dx, 1+cy*charHeight+dy, c) + } + } +} + +func (d *Display) Render() image.Image { + width := 1 + displayWidth*charWidth + height := 1 + displayHeight*charHeight + + img := image.NewRGBA(image.Rect(0, 0, width, height)) + for y := 0; y < height; y++ { + for x := 0; x < width; x++ { + img.Set(x, y, color.Black) + } + } + + for cy := 0; cy < displayHeight; cy++ { + for cx := 0; cx < displayWidth; cx++ { + charImg := charset.ResolveCharToImage(d.chars[cy][cx], d.charset) + d.drawCharacter(img, charImg, cx, cy) + } + } + + return img +} + +func (d *Display) PutChar(ch uint8) { + if d.cursorX >= displayWidth || d.cursorY >= displayHeight { + return + } + + d.chars[d.cursorY][d.cursorX] = ch + d.cursorX++ + if d.cursorX >= displayWidth { + d.cursorX = displayWidth - 1 + } +} + +func (d *Display) LineFeed() { + d.cursorY++ + if d.cursorY >= displayHeight { + d.cursorY = displayHeight - 1 + + // XXX: This relies on displayHeight being exactly 2. + d.chars[0] = d.chars[1] + for x := 0; x < displayWidth; x++ { + d.chars[1][x] = 0x20 + } + } +} + +func (d *Display) CarriageReturn() { + d.cursorX = 0 +} + +func (d *Display) Backspace() { + if d.cursorX > 0 { + d.cursorX-- + } +} + +func (d *Display) SetCursor(x, y int) { + if x >= 0 && x < displayWidth { + d.cursorX = x + } + if y >= 0 && y < displayHeight { + d.cursorY = y + } +} + +// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + +func parseANSI(input string) (command string, params []int) { + if !strings.HasPrefix(input, "\x1b[") { + return "", nil + } + + input = input[2:] + if len(input) == 0 { + return "", nil + } + + cmdIdx := len(input) - 1 + command = string(input[cmdIdx]) + + paramStr := input[:cmdIdx] + if paramStr == "" { + return command, []int{} + } + + parts := strings.Split(paramStr, ";") + for _, p := range parts { + p = strings.TrimSpace(p) + if val, err := strconv.Atoi(p); err == nil { + params = append(params, val) + } + } + return command, params +} + +// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + +type escapeParser struct { + seq strings.Builder + inEsc bool + inCSI bool + display *Display +} + +func newEscapeParser(d *Display) *escapeParser { + return &escapeParser{display: d} +} + +func (ep *escapeParser) reset() { + ep.inEsc = false + ep.inCSI = false + ep.seq.Reset() +} + +func (ep *escapeParser) handleCSICommand() bool { + cmd, params := parseANSI(ep.seq.String()) + + switch cmd { + case "J": // Clear display + // XXX: No params case is unverified. + if len(params) == 0 || params[0] == 2 { + ep.display.Clear() + } + case "K": // Delete to end of line + // XXX: No params case is unverified (but it should work). + if len(params) == 0 || params[0] == 0 { + ep.display.ClearToEnd() + } + case "H": // Cursor position + y, x := 0, 0 + if len(params) >= 1 { + y = params[0] - 1 // 1-indexed to 0-indexed + } + if len(params) >= 2 { + x = params[1] - 1 + } + ep.display.SetCursor(x, y) + } + return true +} + +func (ep *escapeParser) handleEscapeSequence(b byte) bool { + ep.seq.WriteByte(b) + + if ep.seq.Len() == 2 && b == '[' { + ep.inCSI = true + return false + } + + if ep.seq.Len() == 3 && ep.seq.String()[1] == 'R' { + ep.display.charset = b + ep.reset() + return true + } + + if ep.inCSI && (b >= 'A' && b <= 'Z' || b >= 'a' && b <= 'z') { + refresh := ep.handleCSICommand() + ep.reset() + return refresh + } + + if ep.seq.Len() == 6 && ep.seq.String()[1:5] == "\\?LC" { + ep.display.cursorMode = int(ep.seq.String()[5]) + return true + } + + return false +} + +func (ep *escapeParser) handleControlChar(b byte) bool { + switch b { + case 0x0A: // LF + ep.display.LineFeed() + return true + case 0x0D: // CR + ep.display.CarriageReturn() + return true + case 0x08: // BS + ep.display.Backspace() + return true + default: + if b >= 0x20 { + ep.display.PutChar(b) + return true + } + } + return false +} + +func (ep *escapeParser) handleByte(b byte) (needsRefresh bool) { + if b == 0x1b { // ESC + ep.reset() + ep.inEsc = true + ep.seq.WriteByte(b) + return false + } + + if ep.inEsc { + return ep.handleEscapeSequence(b) + } + + return ep.handleControlChar(b) +} + +// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + +func main() { + myApp := app.New() + window := myApp.NewWindow("Toshiba Tec LIUST-50 Simulator") + + display := NewDisplay() + display.Clear() + + img := canvas.NewImageFromImage(display.Render()) + img.FillMode = canvas.ImageFillOriginal + img.ScaleMode = canvas.ImageScalePixels + + window.SetContent(img) + + window.Resize(fyne.NewSize(600, 100)) + + go func() { + reader := bufio.NewReader(os.Stdin) + parser := newEscapeParser(display) + + for { + b, err := reader.ReadByte() + if err != nil { + fyne.DoAndWait(func() { + window.SetTitle(err.Error()) + }) + return + } + + if parser.handleByte(b) { + fyne.DoAndWait(func() { + img.Image = display.Render() + img.Refresh() + }) + } + } + }() + + window.ShowAndRun() +} diff --git a/liust-50/go.mod b/liust-50/go.mod new file mode 100644 index 0000000..451b45e --- /dev/null +++ b/liust-50/go.mod @@ -0,0 +1,40 @@ +module janouch.name/desktop-tools/liust-50 + +go 1.25.1 + +require fyne.io/fyne/v2 v2.7.0 + +require ( + fyne.io/systray v1.11.1-0.20250603113521-ca66a66d8b58 // indirect + github.com/BurntSushi/toml v1.5.0 // indirect + github.com/davecgh/go-spew v1.1.1 // indirect + github.com/fredbi/uri v1.1.1 // indirect + github.com/fsnotify/fsnotify v1.9.0 // indirect + github.com/fyne-io/gl-js v0.2.0 // indirect + github.com/fyne-io/glfw-js v0.3.0 // indirect + github.com/fyne-io/image v0.1.1 // indirect + github.com/fyne-io/oksvg v0.2.0 // indirect + github.com/go-gl/gl v0.0.0-20231021071112-07e5d0ea2e71 // indirect + github.com/go-gl/glfw/v3.3/glfw v0.0.0-20250301202403-da16c1255728 // indirect + github.com/go-text/render v0.2.0 // indirect + github.com/go-text/typesetting v0.3.0 // indirect + github.com/godbus/dbus/v5 v5.1.0 // indirect + github.com/hack-pad/go-indexeddb v0.3.2 // indirect + github.com/hack-pad/safejs v0.1.1 // indirect + github.com/jeandeaual/go-locale v0.0.0-20250612000132-0ef82f21eade // indirect + github.com/jsummers/gobmp v0.0.0-20230614200233-a9de23ed2e25 // indirect + github.com/kr/text v0.1.0 // indirect + github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 // indirect + github.com/nicksnyder/go-i18n/v2 v2.6.0 // indirect + github.com/pmezard/go-difflib v1.0.0 // indirect + github.com/rymdport/portal v0.4.2 // indirect + github.com/srwiley/oksvg v0.0.0-20221011165216-be6e8873101c // indirect + github.com/srwiley/rasterx v0.0.0-20220730225603-2ab79fcdd4ef // indirect + github.com/stretchr/testify v1.11.1 // indirect + github.com/yuin/goldmark v1.7.13 // indirect + golang.org/x/image v0.32.0 // indirect + golang.org/x/net v0.46.0 // indirect + golang.org/x/sys v0.37.0 // indirect + golang.org/x/text v0.30.0 // indirect + gopkg.in/yaml.v3 v3.0.1 // indirect +) diff --git a/liust-50/go.sum b/liust-50/go.sum new file mode 100644 index 0000000..e7ad205 --- /dev/null +++ b/liust-50/go.sum @@ -0,0 +1,80 @@ +fyne.io/fyne/v2 v2.7.0 h1:GvZSpE3X0liU/fqstInVvRsaboIVpIWQ4/sfjDGIGGQ= +fyne.io/fyne/v2 v2.7.0/go.mod h1:xClVlrhxl7D+LT+BWYmcrW4Nf+dJTvkhnPgji7spAwE= +fyne.io/systray v1.11.1-0.20250603113521-ca66a66d8b58 h1:eA5/u2XRd8OUkoMqEv3IBlFYSruNlXD8bRHDiqm0VNI= +fyne.io/systray v1.11.1-0.20250603113521-ca66a66d8b58/go.mod h1:RVwqP9nYMo7h5zViCBHri2FgjXF7H2cub7MAq4NSoLs= +github.com/BurntSushi/toml v1.5.0 h1:W5quZX/G/csjUnuI8SUYlsHs9M38FC7znL0lIO+DvMg= +github.com/BurntSushi/toml v1.5.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho= +github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/felixge/fgprof v0.9.3 h1:VvyZxILNuCiUCSXtPtYmmtGvb65nqXh2QFWc0Wpf2/g= +github.com/felixge/fgprof v0.9.3/go.mod h1:RdbpDgzqYVh/T9fPELJyV7EYJuHB55UTEULNun8eiPw= +github.com/fredbi/uri v1.1.1 h1:xZHJC08GZNIUhbP5ImTHnt5Ya0T8FI2VAwI/37kh2Ko= +github.com/fredbi/uri v1.1.1/go.mod h1:4+DZQ5zBjEwQCDmXW5JdIjz0PUA+yJbvtBv+u+adr5o= +github.com/fsnotify/fsnotify v1.9.0 h1:2Ml+OJNzbYCTzsxtv8vKSFD9PbJjmhYF14k/jKC7S9k= +github.com/fsnotify/fsnotify v1.9.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0= +github.com/fyne-io/gl-js v0.2.0 h1:+EXMLVEa18EfkXBVKhifYB6OGs3HwKO3lUElA0LlAjs= +github.com/fyne-io/gl-js v0.2.0/go.mod h1:ZcepK8vmOYLu96JoxbCKJy2ybr+g1pTnaBDdl7c3ajI= +github.com/fyne-io/glfw-js v0.3.0 h1:d8k2+Y7l+zy2pc7wlGRyPfTgZoqDf3AI4G+2zOWhWUk= +github.com/fyne-io/glfw-js v0.3.0/go.mod h1:Ri6te7rdZtBgBpxLW19uBpp3Dl6K9K/bRaYdJ22G8Jk= +github.com/fyne-io/image v0.1.1 h1:WH0z4H7qfvNUw5l4p3bC1q70sa5+YWVt6HCj7y4VNyA= +github.com/fyne-io/image v0.1.1/go.mod h1:xrfYBh6yspc+KjkgdZU/ifUC9sPA5Iv7WYUBzQKK7JM= +github.com/fyne-io/oksvg v0.2.0 h1:mxcGU2dx6nwjJsSA9PCYZDuoAcsZ/OuJlvg/Q9Njfo8= +github.com/fyne-io/oksvg v0.2.0/go.mod h1:dJ9oEkPiWhnTFNCmRgEze+YNprJF7YRbpjgpWS4kzoI= +github.com/go-gl/gl v0.0.0-20231021071112-07e5d0ea2e71 h1:5BVwOaUSBTlVZowGO6VZGw2H/zl9nrd3eCZfYV+NfQA= +github.com/go-gl/gl v0.0.0-20231021071112-07e5d0ea2e71/go.mod h1:9YTyiznxEY1fVinfM7RvRcjRHbw2xLBJ3AAGIT0I4Nw= +github.com/go-gl/glfw/v3.3/glfw v0.0.0-20250301202403-da16c1255728 h1:RkGhqHxEVAvPM0/R+8g7XRwQnHatO0KAuVcwHo8q9W8= +github.com/go-gl/glfw/v3.3/glfw v0.0.0-20250301202403-da16c1255728/go.mod h1:SyRD8YfuKk+ZXlDqYiqe1qMSqjNgtHzBTG810KUagMc= +github.com/go-text/render v0.2.0 h1:LBYoTmp5jYiJ4NPqDc2pz17MLmA3wHw1dZSVGcOdeAc= +github.com/go-text/render v0.2.0/go.mod h1:CkiqfukRGKJA5vZZISkjSYrcdtgKQWRa2HIzvwNN5SU= +github.com/go-text/typesetting v0.3.0 h1:OWCgYpp8njoxSRpwrdd1bQOxdjOXDj9Rqart9ML4iF4= +github.com/go-text/typesetting v0.3.0/go.mod h1:qjZLkhRgOEYMhU9eHBr3AR4sfnGJvOXNLt8yRAySFuY= +github.com/go-text/typesetting-utils v0.0.0-20241103174707-87a29e9e6066 h1:qCuYC+94v2xrb1PoS4NIDe7DGYtLnU2wWiQe9a1B1c0= +github.com/go-text/typesetting-utils v0.0.0-20241103174707-87a29e9e6066/go.mod h1:DDxDdQEnB70R8owOx3LVpEFvpMK9eeH1o2r0yZhFI9o= +github.com/godbus/dbus/v5 v5.1.0 h1:4KLkAxT3aOY8Li4FRJe/KvhoNFFxo0m6fNuFUO8QJUk= +github.com/godbus/dbus/v5 v5.1.0/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= +github.com/google/pprof v0.0.0-20211214055906-6f57359322fd h1:1FjCyPC+syAzJ5/2S8fqdZK1R22vvA0J7JZKcuOIQ7Y= +github.com/google/pprof v0.0.0-20211214055906-6f57359322fd/go.mod h1:KgnwoLYCZ8IQu3XUZ8Nc/bM9CCZFOyjUNOSygVozoDg= +github.com/hack-pad/go-indexeddb v0.3.2 h1:DTqeJJYc1usa45Q5r52t01KhvlSN02+Oq+tQbSBI91A= +github.com/hack-pad/go-indexeddb v0.3.2/go.mod h1:QvfTevpDVlkfomY498LhstjwbPW6QC4VC/lxYb0Kom0= +github.com/hack-pad/safejs v0.1.1 h1:d5qPO0iQ7h2oVtpzGnLExE+Wn9AtytxIfltcS2b9KD8= +github.com/hack-pad/safejs v0.1.1/go.mod h1:HdS+bKF1NrE72VoXZeWzxFOVQVUSqZJAG0xNCnb+Tio= +github.com/jeandeaual/go-locale v0.0.0-20250612000132-0ef82f21eade h1:FmusiCI1wHw+XQbvL9M+1r/C3SPqKrmBaIOYwVfQoDE= +github.com/jeandeaual/go-locale v0.0.0-20250612000132-0ef82f21eade/go.mod h1:ZDXo8KHryOWSIqnsb/CiDq7hQUYryCgdVnxbj8tDG7o= +github.com/jsummers/gobmp v0.0.0-20230614200233-a9de23ed2e25 h1:YLvr1eE6cdCqjOe972w/cYF+FjW34v27+9Vo5106B4M= +github.com/jsummers/gobmp v0.0.0-20230614200233-a9de23ed2e25/go.mod h1:kLgvv7o6UM+0QSf0QjAse3wReFDsb9qbZJdfexWlrQw= +github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= +github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= +github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 h1:zYyBkD/k9seD2A7fsi6Oo2LfFZAehjjQMERAvZLEDnQ= +github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646/go.mod h1:jpp1/29i3P1S/RLdc7JQKbRpFeM1dOBd8T9ki5s+AY8= +github.com/nicksnyder/go-i18n/v2 v2.6.0 h1:C/m2NNWNiTB6SK4Ao8df5EWm3JETSTIGNXBpMJTxzxQ= +github.com/nicksnyder/go-i18n/v2 v2.6.0/go.mod h1:88sRqr0C6OPyJn0/KRNaEz1uWorjxIKP7rUUcvycecE= +github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs= +github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= +github.com/pkg/profile v1.7.0 h1:hnbDkaNWPCLMO9wGLdBFTIZvzDrDfBM2072E1S9gJkA= +github.com/pkg/profile v1.7.0/go.mod h1:8Uer0jas47ZQMJ7VD+OHknK4YDY07LPUC6dEvqDjvNo= +github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/rymdport/portal v0.4.2 h1:7jKRSemwlTyVHHrTGgQg7gmNPJs88xkbKcIL3NlcmSU= +github.com/rymdport/portal v0.4.2/go.mod h1:kFF4jslnJ8pD5uCi17brj/ODlfIidOxlgUDTO5ncnC4= +github.com/srwiley/oksvg v0.0.0-20221011165216-be6e8873101c h1:km8GpoQut05eY3GiYWEedbTT0qnSxrCjsVbb7yKY1KE= +github.com/srwiley/oksvg v0.0.0-20221011165216-be6e8873101c/go.mod h1:cNQ3dwVJtS5Hmnjxy6AgTPd0Inb3pW05ftPSX7NZO7Q= +github.com/srwiley/rasterx v0.0.0-20220730225603-2ab79fcdd4ef h1:Ch6Q+AZUxDBCVqdkI8FSpFyZDtCVBc2VmejdNrm5rRQ= +github.com/srwiley/rasterx v0.0.0-20220730225603-2ab79fcdd4ef/go.mod h1:nXTWP6+gD5+LUJ8krVhhoeHjvHTutPxMYl5SvkcnJNE= +github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U= +github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U= +github.com/yuin/goldmark v1.7.13 h1:GPddIs617DnBLFFVJFgpo1aBfe/4xcvMc3SB5t/D0pA= +github.com/yuin/goldmark v1.7.13/go.mod h1:ip/1k0VRfGynBgxOz0yCqHrbZXhcjxyuS66Brc7iBKg= +golang.org/x/image v0.32.0 h1:6lZQWq75h7L5IWNk0r+SCpUJ6tUVd3v4ZHnbRKLkUDQ= +golang.org/x/image v0.32.0/go.mod h1:/R37rrQmKXtO6tYXAjtDLwQgFLHmhW+V6ayXlxzP2Pc= +golang.org/x/net v0.46.0 h1:giFlY12I07fugqwPuWJi68oOnpfqFnJIJzaIIm2JVV4= +golang.org/x/net v0.46.0/go.mod h1:Q9BGdFy1y4nkUwiLvT5qtyhAnEHgnQ/zd8PfU6nc210= +golang.org/x/sys v0.37.0 h1:fdNQudmxPjkdUTPnLn5mdQv7Zwvbvpaxqs831goi9kQ= +golang.org/x/sys v0.37.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks= +golang.org/x/text v0.30.0 h1:yznKA/E9zq54KzlzBEAWn1NXSQ8DIp/NYMy88xJjl4k= +golang.org/x/text v0.30.0/go.mod h1:yDdHFIX9t+tORqspjENWgzaCVXgk0yYnYuSZ8UzzBVM= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU= +gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= @@ -809,10 +809,10 @@ static const struct config_schema g_config_general[] = static const struct config_schema g_config_mpd[] = { + // XXX: We might want to allow config item defaults to not disable nulls. { .name = "address", .comment = "MPD host or socket", - .type = CONFIG_ITEM_STRING, - .default_ = "\"localhost\"" }, + .type = CONFIG_ITEM_STRING }, { .name = "service", .comment = "MPD service name or port", .type = CONFIG_ITEM_STRING, @@ -1809,8 +1809,12 @@ mpd_on_io_hook (void *user_data, bool outgoing, const char *line) static void on_mpd_reconnect (void *user_data) { - // FIXME: the user should be able to disable MPD struct app_context *ctx = user_data; + struct config_item *root = ctx->config.root; + const char *address = get_config_string (root, "mpd.address"); + const char *service = get_config_string (root, "mpd.service"); + if (!address) + return; struct mpd_client *c = &ctx->mpd_client; c->user_data = ctx; @@ -1820,10 +1824,7 @@ on_mpd_reconnect (void *user_data) c->on_io_hook = mpd_on_io_hook; struct error *e = NULL; - struct config_item *root = ctx->config.root; - if (!mpd_client_connect (&ctx->mpd_client, - get_config_string (root, "mpd.address"), - get_config_string (root, "mpd.service"), &e)) + if (!mpd_client_connect (&ctx->mpd_client, address, service, &e)) { print_error ("%s: %s", "cannot connect to MPD", e->message); error_free (e); @@ -2249,7 +2250,7 @@ action_noise_adjust (struct app_context *ctx, const struct strv *args) long arg = strtol (args->vector[0], NULL, 10); ctx->noise_fadeout_samples = 0; ctx->noise_fadeout_iterator = 0; - if (!ctx->noise_end_time && (arg < 0 || !noise_start (ctx))) + if (!ctx->noise_end_time && (arg <= 0 || !noise_start (ctx))) return; time_t now = time (NULL); diff --git a/wmstatus.conf.example b/wmstatus.conf.example index 90b472f..8d6a7fb 100644 --- a/wmstatus.conf.example +++ b/wmstatus.conf.example @@ -57,4 +57,7 @@ keys = { "Control XF86AudioRaiseVolume" = "noise-adjust +1" "Control XF86AudioLowerVolume" = "noise-adjust -1" + + # Turns on or off Pioneer integrated amplifiers + "Mod4 Control Delete" = "exec elksmart-comm --nec A538" } |
