diff --git a/assets/mango.desktop b/assets/mango-wl.desktop similarity index 78% rename from assets/mango.desktop rename to assets/mango-wl.desktop index 37c4fad0..dc93a0da 100644 --- a/assets/mango.desktop +++ b/assets/mango-wl.desktop @@ -1,8 +1,8 @@ [Desktop Entry] Encoding=UTF-8 -Name=Mango +Name=Mango WL DesktopNames=mango;wlroots Comment=mango WM -Exec=mango +Exec=mango-wl Icon=mango Type=Application diff --git a/meson.build b/meson.build index 37886975..cde6c600 100644 --- a/meson.build +++ b/meson.build @@ -90,7 +90,7 @@ if get_option('asan') link_args += '-fsanitize=address' endif -executable('mango', +executable('mango-wl', 'src/mango.c', 'src/common/util.c', wayland_sources, @@ -117,7 +117,7 @@ dwl_ipc_protocol = 'protocols/dwl-ipc-unstable-v2.xml' wayland_scanner_client_header = generator( wayland_scanner, - output: '@BASENAME@-protocol.h', + output: '@BASENAME@-protocol.h', arguments: ['client-header', '@INPUT@', '@OUTPUT@'] ) @@ -128,7 +128,7 @@ wayland_scanner_private_code = generator( ) # use generator in mmsg target -executable('mmsg', +executable('mmsg-wl', 'mmsg/mmsg.c', wayland_scanner_private_code.process(dwl_ipc_protocol), wayland_scanner_client_header.process(dwl_ipc_protocol), @@ -145,7 +145,7 @@ executable('mmsg', mandir = get_option('mandir') desktop_install_dir = join_paths(prefix, 'share/wayland-sessions') portal_install_dir = join_paths(prefix, 'share/xdg-desktop-portal') -install_data('assets/mango.desktop', install_dir : desktop_install_dir) +install_data('assets/mango-wl.desktop', install_dir : desktop_install_dir) install_data('assets/mango-portals.conf', install_dir : portal_install_dir) -install_data('assets/config.conf', install_dir : join_paths(sysconfdir, 'mango')) -install_data('mmsg/mmsg.1', install_dir : join_paths(mandir, 'man1')) +install_data('assets/config.conf', install_dir : join_paths(sysconfdir, 'mango-wl')) +install_data('mmsg/mmsg-wl.1', install_dir : join_paths(mandir, 'man1')) diff --git a/mmsg/mmsg.1 b/mmsg/mmsg-wl.1 similarity index 100% rename from mmsg/mmsg.1 rename to mmsg/mmsg-wl.1 diff --git a/src/config/parse_config.h b/src/config/parse_config.h index fadefb2d..ad6e96ff 100644 --- a/src/config/parse_config.h +++ b/src/config/parse_config.h @@ -2797,7 +2797,7 @@ bool parse_config_file(Config *config, const char *file_path, bool must_exist) { "variable not set.\n"); return false; } - snprintf(full_path, sizeof(full_path), "%s/.config/mango/%s", home, + snprintf(full_path, sizeof(full_path), "%s/.config/mango-wl/%s", home, file_path + 1); } file = fopen(full_path, "r"); @@ -3581,13 +3581,13 @@ bool parse_config(void) { return false; } // 构建日志文件路径 - snprintf(filename, sizeof(filename), "%s/.config/mango/config.conf", + snprintf(filename, sizeof(filename), "%s/.config/mango-wl/config.conf", homedir); // 检查文件是否存在 if (access(filename, F_OK) != 0) { - // 如果文件不存在,则使用 /etc/mango/config.conf - snprintf(filename, sizeof(filename), "%s/mango/config.conf", + // 如果文件不存在,则使用 /etc/mango-wl/config.conf + snprintf(filename, sizeof(filename), "%s/mango-wl/config.conf", SYSCONFDIR); } } diff --git a/src/mango.c b/src/mango.c index 2a5a8d49..c75795a5 100644 --- a/src/mango.c +++ b/src/mango.c @@ -7042,8 +7042,8 @@ int32_t main(int32_t argc, char *argv[]) { } else if (c == 'd') { cli_debug_log = true; } else if (c == 'v') { - printf("mango " VERSION "\n"); - return EXIT_SUCCESS; + printf("mango-wl " VERSION "\n"); + return EXIT_SUCCESS; } else if (c == 'c') { cli_config_path = optarg; } else if (c == 'p') { @@ -7065,7 +7065,7 @@ int32_t main(int32_t argc, char *argv[]) { cleanup(); return EXIT_SUCCESS; usage: - printf("Usage: mango [OPTIONS]\n" + printf("Usage: mango-wl [OPTIONS]\n" "\n" "Options:\n" " -v Show mango version\n"