mirrors/maomaowm
1
0
Fork 0
mirror of https://github.com/DreamMaoMao/maomaowm.git synced 2026-06-19 14:33:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merge 5b58df6650 into f677c71ec6

Browse source
This commit is contained in:
CtrlLuzzio 2026-06-19 00:21:22 +00:00 • committed by GitHub
commit 308cb9a65f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

4
assets/mango.desktop → assets/mango-wl.desktop
View file

@ -1,8 +1,8 @@
[Desktop Entry] [Desktop Entry]
Encoding=UTF-8 Encoding=UTF-8
Name=Mango Name=Mango WL
DesktopNames=mango;wlroots DesktopNames=mango;wlroots
Comment=mango WM Comment=mango WM
Exec=mango Exec=mango-wl
Icon=mango Icon=mango
Type=Application Type=Application

10
meson.build
View file

@ -92,7 +92,7 @@ if get_option('asan')
link_args += '-fsanitize=address' link_args += '-fsanitize=address'
endif endif
executable('mango', executable('mango-wl',
'src/mango.c', 'src/mango.c',
'src/common/util.c', 'src/common/util.c',
'src/draw/text-node.c', 'src/draw/text-node.c',
@ -133,7 +133,7 @@ wayland_scanner_private_code = generator(
) )
# use generator in mmsg target # use generator in mmsg target
executable('mmsg', executable('mmsg-wl',
'mmsg/mmsg.c', 'mmsg/mmsg.c',
wayland_scanner_private_code.process(dwl_ipc_protocol), wayland_scanner_private_code.process(dwl_ipc_protocol),
wayland_scanner_client_header.process(dwl_ipc_protocol), wayland_scanner_client_header.process(dwl_ipc_protocol),
@ -150,7 +150,7 @@ executable('mmsg',
mandir = get_option('mandir') mandir = get_option('mandir')
desktop_install_dir = join_paths(prefix, 'share/wayland-sessions') desktop_install_dir = join_paths(prefix, 'share/wayland-sessions')
portal_install_dir = join_paths(prefix, 'share/xdg-desktop-portal') 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/mango-portals.conf', install_dir : portal_install_dir)
install_data('assets/config.conf', install_dir : join_paths(sysconfdir, 'mango')) install_data('assets/config.conf', install_dir : join_paths(sysconfdir, 'mango-wl'))
install_data('mmsg/mmsg.1', install_dir : join_paths(mandir, 'man1')) install_data('mmsg/mmsg-wl.1', install_dir : join_paths(mandir, 'man1'))

0
mmsg/mmsg.1 → mmsg/mmsg-wl.1
View file

8
src/config/parse_config.h
View file

@ -2966,7 +2966,7 @@ bool parse_config_file(Config *config, const char *file_path, bool must_exist) {
"variable not set.\n"); "variable not set.\n");
return false; 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_path + 1);
} }
file = fopen(full_path, "r"); file = fopen(full_path, "r");
@ -3832,13 +3832,13 @@ bool parse_config(void) {
return false; return false;
} }
// 构建日志文件路径 // 构建日志文件路径
snprintf(filename, sizeof(filename), "%s/.config/mango/config.conf", snprintf(filename, sizeof(filename), "%s/.config/mango-wl/config.conf",
homedir); homedir);
// 检查文件是否存在 // 检查文件是否存在
if (access(filename, F_OK) != 0) { if (access(filename, F_OK) != 0) {
// 如果文件不存在，则使用 /etc/mango/config.conf // 如果文件不存在，则使用 /etc/mango-wl/config.conf
snprintf(filename, sizeof(filename), "%s/mango/config.conf", snprintf(filename, sizeof(filename), "%s/mango-wl/config.conf",
SYSCONFDIR); SYSCONFDIR);
} }
} }

4
src/mango.c
View file

@ -7164,7 +7164,7 @@ int32_t main(int32_t argc, char *argv[]) {
} else if (c == 'd') { } else if (c == 'd') {
cli_debug_log = true; cli_debug_log = true;
} else if (c == 'v') { } else if (c == 'v') {
printf("mango " VERSION "\n"); printf("mango-wl " VERSION "\n");
return EXIT_SUCCESS; return EXIT_SUCCESS;
} else if (c == 'c') { } else if (c == 'c') {
cli_config_path = optarg; cli_config_path = optarg;
@ -7187,7 +7187,7 @@ int32_t main(int32_t argc, char *argv[]) {
cleanup(); cleanup();
return EXIT_SUCCESS; return EXIT_SUCCESS;
usage: usage:
printf("Usage: mango [OPTIONS]\n" printf("Usage: mango-wl [OPTIONS]\n"
"\n" "\n"
"Options:\n" "Options:\n"
" -v Show mango version\n" " -v Show mango version\n"