From dc3867fd329c804e7946ad7ecbc9df4b0d3b58cc Mon Sep 17 00:00:00 2001 From: Damien Tardy-Panis Date: Tue, 24 Sep 2024 10:11:33 +0200 Subject: [PATCH] Rename to wend --- completions/meson.build | 2 +- completions/zsh/{_takang => _wend} | 2 +- doc/meson.build | 6 ++--- doc/{takang.scd => wend.scd} | 16 ++++++------- example | 4 ++-- include/console.h | 4 ++-- include/event-loop.h | 4 ++-- include/keyboard.h | 4 ++-- include/options.h | 4 ++-- include/pool-buffer.h | 4 ++-- include/script.h | 4 ++-- include/wayland.h | 4 ++-- include/{takang.h => wend.h} | 4 ++-- include/window.h | 4 ++-- meson.build | 36 +++++++++++++++--------------- src/console.c | 2 +- src/event-loop.c | 2 +- src/keyboard.c | 2 +- src/main.c | 4 ++-- src/options.c | 6 ++--- src/wayland.c | 4 ++-- src/window.c | 2 +- test/meson.build | 4 ++-- 23 files changed, 64 insertions(+), 64 deletions(-) rename completions/zsh/{_takang => _wend} (98%) rename doc/{takang.scd => wend.scd} (89%) rename include/{takang.h => wend.h} (97%) diff --git a/completions/meson.build b/completions/meson.build index 633766e..e23bc32 100644 --- a/completions/meson.build +++ b/completions/meson.build @@ -1,6 +1,6 @@ if get_option('zsh-completions') install_data( - files('zsh/_takang'), + files('zsh/_wend'), install_dir: get_option('datadir') / 'zsh/site-functions', install_mode: 'rw-r--r--', ) diff --git a/completions/zsh/_takang b/completions/zsh/_wend similarity index 98% rename from completions/zsh/_takang rename to completions/zsh/_wend index 97be0fb..a1469cb 100644 --- a/completions/zsh/_takang +++ b/completions/zsh/_wend @@ -1,4 +1,4 @@ -#compdef takang +#compdef wend _arguments \ '(-b --background-color)'{-b,--background-color}'[Background color]:color:' \ diff --git a/doc/meson.build b/doc/meson.build index d49e56c..dbe1d86 100644 --- a/doc/meson.build +++ b/doc/meson.build @@ -6,9 +6,9 @@ endif mandir = get_option('mandir') custom_target( - 'takang.1', - input: 'takang.scd', - output: 'takang.1', + 'wend.1', + input: 'wend.scd', + output: 'wend.1', command: scdoc.get_variable('scdoc'), feed: true, capture: true, diff --git a/doc/takang.scd b/doc/wend.scd similarity index 89% rename from doc/takang.scd rename to doc/wend.scd index 7efd55c..6fa6d96 100644 --- a/doc/takang.scd +++ b/doc/wend.scd @@ -1,16 +1,16 @@ -TAKANG(1) +WEND(1) # NAME -takang - Minimal presentation tool +wend - Minimal presentation tool # SYNOPSIS -takang [-sT] [-w _width_] [-h _height_]++ - [-b _color_] [-f _color_] [-F _font_] [-t _theme_]++ - [-d _mode_] [-n [_corner_]] [-c [_duration_]]++ - [--help] [--version]++ - _file_ +wend [-sT] [-w _width_] [-h _height_]++ + [-b _color_] [-f _color_] [-F _font_] [-t _theme_]++ + [-d _mode_] [-n [_corner_]] [-c [_duration_]]++ + [--help] [--version]++ + _file_ # DESCRIPTION @@ -118,4 +118,4 @@ default: 640 # SEE ALSO -Project homepage: _https://sr.ht/~tardypad/takang_ +Project homepage: _https://sr.ht/~tardypad/wend_ diff --git a/example b/example index 78bbf34..6bd94dd 100644 --- a/example +++ b/example @@ -3,7 +3,7 @@ | - display some possible usages | - highlight the main characteristics -takang +wend Hello, 🌍🌏🌎! @@ -23,7 +23,7 @@ Minimal Permanent -| Forever readable even without takang +| Forever readable even without wend Efficient diff --git a/include/console.h b/include/console.h index 1b50641..a4a1b39 100644 --- a/include/console.h +++ b/include/console.h @@ -1,5 +1,5 @@ -#ifndef TAKANG_CONSOLE_H -#define TAKANG_CONSOLE_H +#ifndef WEND_CONSOLE_H +#define WEND_CONSOLE_H #include #include diff --git a/include/event-loop.h b/include/event-loop.h index c0ef129..6e32009 100644 --- a/include/event-loop.h +++ b/include/event-loop.h @@ -1,5 +1,5 @@ -#ifndef TAKANG_EVENT_LOOP_H -#define TAKANG_EVENT_LOOP_H +#ifndef WEND_EVENT_LOOP_H +#define WEND_EVENT_LOOP_H #include #include diff --git a/include/keyboard.h b/include/keyboard.h index fc231f7..07b735d 100644 --- a/include/keyboard.h +++ b/include/keyboard.h @@ -1,5 +1,5 @@ -#ifndef TAKANG_KEYBOARD_H -#define TAKANG_KEYBOARD_H +#ifndef WEND_KEYBOARD_H +#define WEND_KEYBOARD_H #include diff --git a/include/options.h b/include/options.h index ef21129..2594ae2 100644 --- a/include/options.h +++ b/include/options.h @@ -1,5 +1,5 @@ -#ifndef TAKANG_OPTIONS_H -#define TAKANG_OPTIONS_H +#ifndef WEND_OPTIONS_H +#define WEND_OPTIONS_H #include #include diff --git a/include/pool-buffer.h b/include/pool-buffer.h index 6d82309..1062833 100644 --- a/include/pool-buffer.h +++ b/include/pool-buffer.h @@ -1,5 +1,5 @@ -#ifndef TAKANG_POOL_BUFFER_H -#define TAKANG_POOL_BUFFER_H +#ifndef WEND_POOL_BUFFER_H +#define WEND_POOL_BUFFER_H #include #include diff --git a/include/script.h b/include/script.h index f0fcd38..1265884 100644 --- a/include/script.h +++ b/include/script.h @@ -1,5 +1,5 @@ -#ifndef TAKANG_SCRIPT_H -#define TAKANG_SCRIPT_H +#ifndef WEND_SCRIPT_H +#define WEND_SCRIPT_H #include #include diff --git a/include/wayland.h b/include/wayland.h index 9021635..bf34501 100644 --- a/include/wayland.h +++ b/include/wayland.h @@ -1,5 +1,5 @@ -#ifndef TAKANG_WAYLAND_H -#define TAKANG_WAYLAND_H +#ifndef WEND_WAYLAND_H +#define WEND_WAYLAND_H #include diff --git a/include/takang.h b/include/wend.h similarity index 97% rename from include/takang.h rename to include/wend.h index 0b454aa..b764f41 100644 --- a/include/takang.h +++ b/include/wend.h @@ -1,5 +1,5 @@ -#ifndef TAKANG_H -#define TAKANG_H +#ifndef WEND_H +#define WEND_H #include #include "event-loop.h" diff --git a/include/window.h b/include/window.h index ff98f30..cf135ed 100644 --- a/include/window.h +++ b/include/window.h @@ -1,5 +1,5 @@ -#ifndef TAKANG_WINDOW_H -#define TAKANG_WINDOW_H +#ifndef WEND_WINDOW_H +#define WEND_WINDOW_H #include diff --git a/meson.build b/meson.build index dc0e8a4..866b833 100644 --- a/meson.build +++ b/meson.build @@ -1,5 +1,5 @@ project( - 'takang', + 'wend', 'c', version: '0.1.0', license: 'GPL', @@ -20,7 +20,7 @@ if prog_git.found() and fs.is_dir('.git') version = git_description.stdout().strip() endif endif -add_project_arguments('-DTAKANG_VERSION="@0@"'.format(version), language: 'c') +add_project_arguments('-DWEND_VERSION="@0@"'.format(version), language: 'c') add_project_arguments([ '-D_POSIX_C_SOURCE=200809L', @@ -34,7 +34,7 @@ wayland_client = dependency('wayland-client') wayland_protos = dependency('wayland-protocols') xkbcommon = dependency('xkbcommon') -takang_include = include_directories('include') +wend_include = include_directories('include') wayland_scanner = dependency('wayland-scanner', native: true) wayland_scanner_path = wayland_scanner.get_variable(pkgconfig: 'wayland_scanner') @@ -54,33 +54,33 @@ wayland_scanner_client = generator( wl_protocol_dir = wayland_protos.get_variable(pkgconfig: 'pkgdatadir') -takang_protocols = [ +wend_protocols = [ wl_protocol_dir / 'stable/xdg-shell/xdg-shell.xml', wl_protocol_dir / 'unstable/idle-inhibit/idle-inhibit-unstable-v1.xml', wl_protocol_dir / 'unstable/xdg-decoration/xdg-decoration-unstable-v1.xml', ] -takang_protos_src = [] -takang_protos_headers = [] +wend_protos_src = [] +wend_protos_headers = [] -foreach p : takang_protocols - takang_protos_src += wayland_scanner_code.process(p) - takang_protos_headers += wayland_scanner_client.process(p) +foreach p : wend_protocols + wend_protos_src += wayland_scanner_code.process(p) + wend_protos_headers += wayland_scanner_client.process(p) endforeach -lib_takang_protos = static_library( - 'takang_protos', - takang_protos_src + takang_protos_headers, +lib_wend_protos = static_library( + 'wend_protos', + wend_protos_src + wend_protos_headers, dependencies: [wayland_client] ) -takang_protos = declare_dependency( - link_with: lib_takang_protos, - sources: takang_protos_headers, +wend_protos = declare_dependency( + link_with: lib_wend_protos, + sources: wend_protos_headers, ) executable( - 'takang', + 'wend', files( 'src/console.c', 'src/event-loop.c', @@ -94,13 +94,13 @@ executable( ), dependencies: [ cairo, - takang_protos, + wend_protos, pango, pangocairo, wayland_client, xkbcommon, ], - include_directories: [takang_include], + include_directories: [wend_include], install: true, ) diff --git a/src/console.c b/src/console.c index 402870a..3c6ab12 100644 --- a/src/console.c +++ b/src/console.c @@ -5,7 +5,7 @@ #include #include "console.h" #include "script.h" -#include "takang.h" +#include "wend.h" const int RENDER_DELAY = 400; const int CLOCK_INTERVAL = 500; diff --git a/src/event-loop.c b/src/event-loop.c index fb2a68d..bf5381b 100644 --- a/src/event-loop.c +++ b/src/event-loop.c @@ -4,7 +4,7 @@ #include #include #include "event-loop.h" -#include "takang.h" +#include "wend.h" #include "console.h" #include "keyboard.h" #include "wayland.h" diff --git a/src/keyboard.c b/src/keyboard.c index e1ffcee..0c33149 100644 --- a/src/keyboard.c +++ b/src/keyboard.c @@ -4,7 +4,7 @@ #include #include #include -#include "takang.h" +#include "wend.h" #include "keyboard.h" // Define limits meaningful for our usage (normally meant for typing). diff --git a/src/main.c b/src/main.c index cfdea03..f4e5b79 100644 --- a/src/main.c +++ b/src/main.c @@ -3,7 +3,7 @@ #include #include "console.h" #include "event-loop.h" -#include "takang.h" +#include "wend.h" #include "keyboard.h" #include "options.h" #include "script.h" @@ -21,7 +21,7 @@ int main(int argc, char *argv[]) { goto exit; } if (state.options == NULL) { - fprintf(stderr, "Try \"takang --help\" for more information\n"); + fprintf(stderr, "Try \"wend --help\" for more information\n"); goto exit; } diff --git a/src/options.c b/src/options.c index 36c3e8c..09d5808 100644 --- a/src/options.c +++ b/src/options.c @@ -8,7 +8,7 @@ const uint32_t dark_color = 0x34373BFF; const uint32_t light_color = 0xF2F7FCFF; static const char usage[] = - "Usage: takang [options...] file\n" + "Usage: wend [options...] file\n" "\n" " -b, --background-color Background color\n" " -c, --clock [] Display clock in presenter view\n" @@ -24,7 +24,7 @@ static const char usage[] = " --help Display help\n" " --version Display version\n" "\n" - "Try \"man takang\" for more information\n"; + "Try \"man wend\" for more information\n"; static struct tk_options *tk_options_init() { struct tk_options *options = calloc(1, sizeof *options); @@ -185,7 +185,7 @@ struct tk_options *tk_options_parse(int argc, char **argv, bool *exit) { *exit = true; return NULL; } else if (strcmp(name, "version") == 0) { - printf("%s\n", TAKANG_VERSION); + printf("%s\n", WEND_VERSION); *exit = true; return NULL; } diff --git a/src/wayland.c b/src/wayland.c index 517cdf5..dac6fec 100644 --- a/src/wayland.c +++ b/src/wayland.c @@ -8,7 +8,7 @@ #include #include #include -#include "takang.h" +#include "wend.h" #include "keyboard.h" #include "options.h" #include "window.h" @@ -416,7 +416,7 @@ bool tk_wl_init(struct tk_state *state) { } xdg_toplevel_set_title(state->xdg_toplevel, tk_script_title(state->script)); - xdg_toplevel_set_app_id(state->xdg_toplevel, "takang"); + xdg_toplevel_set_app_id(state->xdg_toplevel, "wend"); wl_surface_commit(state->wl_surface); return true; diff --git a/src/window.c b/src/window.c index 554a438..11ae540 100644 --- a/src/window.c +++ b/src/window.c @@ -4,7 +4,7 @@ #include #include #include "script.h" -#include "takang.h" +#include "wend.h" #include "options.h" #include "pool-buffer.h" #include "window.h" diff --git a/test/meson.build b/test/meson.build index 10e204e..9f5ca5c 100644 --- a/test/meson.build +++ b/test/meson.build @@ -6,7 +6,7 @@ foreach test_name : ['simple', 'ignored_lines', 'notes'] 'test_script_@0@'.format(test_name), files('scripts/@0@.c'.format(test_name), '../src/script.c'), dependencies: [ wayland_client ], - include_directories: [takang_include], + include_directories: [wend_include], ), workdir: meson.current_source_dir() / 'scripts', ) @@ -20,7 +20,7 @@ foreach test_name : ['empty', 'non_existing'] 'test_script_@0@'.format(test_name), files('scripts/invalid.c', '../src/script.c'), dependencies: [ wayland_client ], - include_directories: [takang_include], + include_directories: [wend_include], ), args: [test_name], workdir: meson.current_source_dir() / 'scripts', -- 2.45.2