mirrors/maomaowm
1
0
Fork 0
mirror of https://github.com/DreamMaoMao/maomaowm.git synced 2026-07-10 00:07:25 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Merge pull request #1136 from WeraPea/load_config_file

Browse source 
feat: add load_config_file
This commit is contained in:
DreamMaoMao 2026-07-09 08:30:01 +08:00 • committed by GitHub
commit 9660be571f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 16 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

1
docs/bindings/keys.md
View file

@ -167,6 +167,7 @@ bindr=Super,Super_L,spawn,rofi -show run
| `spawn_shell` | `cmd` | Execute shell command (supports pipes `\|`). |
| `spawn_on_empty` | `cmd,tagnumber` | Open command on empty tag. |
| `reload_config` | - | Hot-reload configuration. |
| `load_config_file` | `file path` | Load configuration from the specified file. Empty path resets to default config location. |
| `quit` | - | Exit mangowm. |
| `toggleoverview` | - | Toggle overview mode. |
| `togglejump` | - | Toggle overview with jump mode. |

7
src/config/parse_config.h
View file

@ -1212,6 +1212,9 @@ FuncType parse_func_name(char *func_name, Arg *arg, char *arg_value,
(*arg).i = atoi(arg_value);
} else if (strcmp(func_name, "reload_config") == 0) {
func = reload_config;
} else if (strcmp(func_name, "load_config_file") == 0) {
func = load_config_file;
(*arg).v = strdup(arg_value);
} else if (strcmp(func_name, "tag") == 0) {
func = tag;
(*arg).ui = 1 << (atoi(arg_value) - 1);
@ -3085,7 +3088,7 @@ bool parse_config_file(Config *config, const char *file_path, bool must_exist) {
if (file_path[0] == '.' && file_path[1] == '/') {
// Relative path
if (cli_config_path) {
if (cli_config_path[0]) {
char *config_path = strdup(cli_config_path);
char *config_dir = dirname(config_path);
snprintf(full_path, sizeof(full_path), "%s/%s", config_dir,
@ -4007,7 +4010,7 @@ bool parse_config(void) {
create_config_keymap();
if (cli_config_path) {
if (cli_config_path[0]) {
snprintf(filename, sizeof(filename), "%s", cli_config_path);
} else {
// 获取当前用户家目录

1
src/dispatch/bind_declare.h
View file

@ -43,6 +43,7 @@ int32_t focusstack(const Arg *arg);
int32_t groupfocus(const Arg *arg);
int32_t chvt(const Arg *arg);
int32_t reload_config(const Arg *arg);
int32_t load_config_file(const Arg *arg);
int32_t smartmovewin(const Arg *arg);
int32_t smartresizewin(const Arg *arg);
int32_t centerwin(const Arg *arg);

8
src/dispatch/bind_define.h
View file

@ -2197,4 +2197,10 @@ int32_t focusid(const Arg *arg) {
client_active(c);
return 0;
}
}
int32_t load_config_file(const Arg *arg) {
snprintf(cli_config_path, sizeof(cli_config_path), "%s", arg->v);
reload_config(arg);
return 0;
}

4
src/mango.c
View file

@ -1074,7 +1074,7 @@ static struct wl_event_source *hide_cursor_source;
static struct wl_event_source *keep_idle_inhibit_source;
static bool cursor_hidden = false;
static bool tag_combo = false;
static const char *cli_config_path = NULL;
static char cli_config_path[1024] = {0};
static int active_capture_count = 0;
static bool cli_debug_log = false;
static KeyMode keymode = {
@ -7519,7 +7519,7 @@ int32_t main(int32_t argc, char *argv[]) {
printf("mango " VERSION "\n");
return EXIT_SUCCESS;
} else if (c == 'c') {
cli_config_path = optarg;
snprintf(cli_config_path, sizeof(cli_config_path), "%s", optarg);
} else if (c == 'p') {
return parse_config() ? EXIT_SUCCESS : EXIT_FAILURE;
} else {