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

动态重载函数

Browse source
This commit is contained in:
DreamMaoMao 2025-02-16 21:05:04 +08:00
parent 1d58841bfd
commit d4731be3fa
1 changed files with 17 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

24
maomao.c
View file

@ -123,11 +123,11 @@ enum {
#endif #endif
enum { UP, DOWN, LEFT, RIGHT, UNDIR }; /* movewin */ enum { UP, DOWN, LEFT, RIGHT, UNDIR }; /* movewin */
typedef union { typedef struct {
int i; int i;
unsigned int ui;
float f; float f;
const void *v; char *v;
unsigned int ui;
} Arg; } Arg;
typedef struct { typedef struct {
@ -4138,7 +4138,7 @@ void // 17
setlayout(const Arg *arg) { setlayout(const Arg *arg) {
if (!selmon) if (!selmon)
return; return;
if (!arg || !arg->v || arg->v != selmon->lt[selmon->sellt]) if (!arg || !arg->v || strcmp(arg->v, selmon->lt[selmon->sellt]->name))
selmon->sellt ^= 1; selmon->sellt ^= 1;
if (arg && arg->v) { if (arg && arg->v) {
selmon->lt[selmon->sellt] = (Layout *)arg->v; selmon->lt[selmon->sellt] = (Layout *)arg->v;
@ -4354,17 +4354,27 @@ void free_config(void) {
free(config.monitor_rules); free(config.monitor_rules);
for ( i = 0; i < config.key_bindings_count; i++) { for ( i = 0; i < config.key_bindings_count; i++) {
if (config.key_bindings[i].arg.v) free((void *)config.key_bindings[i].arg.v); if (config.key_bindings[i].arg.v) {
logtofile(config.key_bindings[i].arg.v);
free((void *)config.key_bindings[i].arg.v);
config.key_bindings[i].arg.v = NULL; // 避免重复释放
}
} }
free(config.key_bindings); free(config.key_bindings);
for ( i = 0; i < config.mouse_bindings_count; i++) { for ( i = 0; i < config.mouse_bindings_count; i++) {
if (config.mouse_bindings[i].arg.v) free((void *)config.mouse_bindings[i].arg.v); if (config.mouse_bindings[i].arg.v) {
free((void *)config.mouse_bindings[i].arg.v);
config.mouse_bindings[i].arg.v = NULL; // 避免重复释放
}
} }
free(config.mouse_bindings); free(config.mouse_bindings);
for (i = 0; i < config.axis_bindings_count; i++) { for (i = 0; i < config.axis_bindings_count; i++) {
if (config.axis_bindings[i].arg.v) free((void *)config.axis_bindings[i].arg.v); if (config.axis_bindings[i].arg.v) {
free((void *)config.axis_bindings[i].arg.v);
config.axis_bindings[i].arg.v = NULL; // 避免重复释放
}
} }
free(config.axis_bindings); free(config.axis_bindings);