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

opt: rename some var

Browse source
This commit is contained in:
DreamMaoMao 2026-07-06 13:54:28 +08:00
parent 96d1d3805a
commit 516052ff14
5 changed files with 25 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

6
docs/bindings/keys.md
View file

@ -177,9 +177,9 @@ bindr=Super,Super_L,spawn,rofi -show run
| `setkeymode` | `mode` | Set keymode. | | `setkeymode` | `mode` | Set keymode. |
| `switch_keyboard_layout` | `[index]` | Switch keyboard layout. Optional index (0, 1, 2...) to switch to specific layout. | | `switch_keyboard_layout` | `[index]` | Switch keyboard layout. Optional index (0, 1, 2...) to switch to specific layout. |
| `setoption` | `key,value` | Set config option temporarily. | | `setoption` | `key,value` | Set config option temporarily. |
| `dpms_off_monitor` | `monitor_spec` | Shutdown monitor power but not remove. Accepts a [monitor spec](/docs/configuration/monitors#monitor-spec-format). | | `sleep_monitor` | `monitor_spec` | Shutdown monitor power but not remove. Accepts a [monitor spec](/docs/configuration/monitors#monitor-spec-format). |
| `dpms_on_monitor` | `monitor_spec` | Turn on monitor power. Accepts a [monitor spec](/docs/configuration/monitors#monitor-spec-format). | | `wakeup_monitor` | `monitor_spec` | Turn on monitor power. Accepts a [monitor spec](/docs/configuration/monitors#monitor-spec-format). |
| `dpms_toggle_monitor` | `monitor_spec` | Toggle monitor power but not remove. Accepts a [monitor spec](/docs/configuration/monitors#monitor-spec-format). | `sleep_toggle_monitor` | `monitor_spec` | Toggle monitor power but not remove. Accepts a [monitor spec](/docs/configuration/monitors#monitor-spec-format).
| `disable_monitor` | `monitor_spec` | remove monitor. Accepts a [monitor spec](/docs/configuration/monitors#monitor-spec-format). | | `disable_monitor` | `monitor_spec` | remove monitor. Accepts a [monitor spec](/docs/configuration/monitors#monitor-spec-format). |
| `enable_monitor` | `monitor_spec` | add monitor. Accepts a [monitor spec](/docs/configuration/monitors#monitor-spec-format). | | `enable_monitor` | `monitor_spec` | add monitor. Accepts a [monitor spec](/docs/configuration/monitors#monitor-spec-format). |
| `toggle_monitor` | `monitor_spec` | Toggle monitor add/remove. Accepts a [monitor spec](/docs/configuration/monitors#monitor-spec-format). | | `toggle_monitor` | `monitor_spec` | Toggle monitor add/remove. Accepts a [monitor spec](/docs/configuration/monitors#monitor-spec-format). |

12
src/config/parse_config.h
View file

@ -1297,14 +1297,14 @@ FuncType parse_func_name(char *func_name, Arg *arg, char *arg_value,
} else if (strcmp(func_name, "toggle_monitor") == 0) { } else if (strcmp(func_name, "toggle_monitor") == 0) {
func = toggle_monitor; func = toggle_monitor;
(*arg).v = strdup(arg_value); (*arg).v = strdup(arg_value);
} else if (strcmp(func_name, "dpms_off_monitor") == 0) { } else if (strcmp(func_name, "sleep_monitor") == 0) {
func = dpms_off_monitor; func = sleep_monitor;
(*arg).v = strdup(arg_value); (*arg).v = strdup(arg_value);
} else if (strcmp(func_name, "dpms_on_monitor") == 0) { } else if (strcmp(func_name, "wakeup_monitor") == 0) {
func = dpms_on_monitor; func = wakeup_monitor;
(*arg).v = strdup(arg_value); (*arg).v = strdup(arg_value);
} else if (strcmp(func_name, "dpms_toggle_monitor") == 0) { } else if (strcmp(func_name, "sleep_toggle_monitor") == 0) {
func = dpms_toggle_monitor; func = sleep_toggle_monitor;
(*arg).v = strdup(arg_value); (*arg).v = strdup(arg_value);
} else if (strcmp(func_name, "scroller_stack") == 0) { } else if (strcmp(func_name, "scroller_stack") == 0) {
func = scroller_stack; func = scroller_stack;

6
src/dispatch/bind_declare.h
View file

@ -73,9 +73,9 @@ int32_t setoption(const Arg *arg);
int32_t disable_monitor(const Arg *arg); int32_t disable_monitor(const Arg *arg);
int32_t enable_monitor(const Arg *arg); int32_t enable_monitor(const Arg *arg);
int32_t toggle_monitor(const Arg *arg); int32_t toggle_monitor(const Arg *arg);
int32_t dpms_off_monitor(const Arg *arg); int32_t sleep_monitor(const Arg *arg);
int32_t dpms_on_monitor(const Arg *arg); int32_t wakeup_monitor(const Arg *arg);
int32_t dpms_toggle_monitor(const Arg *arg); int32_t sleep_toggle_monitor(const Arg *arg);
int32_t scroller_stack(const Arg *arg); int32_t scroller_stack(const Arg *arg);
int32_t toggle_all_floating(const Arg *arg); int32_t toggle_all_floating(const Arg *arg);
int32_t dwindle_toggle_split_direction(const Arg *arg); int32_t dwindle_toggle_split_direction(const Arg *arg);

18
src/dispatch/bind_define.h
View file

@ -1938,7 +1938,7 @@ int32_t disable_monitor(const Arg *arg) {
if (match_monitor_spec(arg->v, m)) { if (match_monitor_spec(arg->v, m)) {
wlr_output_state_set_enabled(&m->pending, false); wlr_output_state_set_enabled(&m->pending, false);
mango_output_commit(m); mango_output_commit(m);
m->only_dpms_off = 0; m->only_sleep = 0;
updatemons(NULL, NULL); updatemons(NULL, NULL);
break; break;
} }
@ -1952,7 +1952,7 @@ int32_t enable_monitor(const Arg *arg) {
if (match_monitor_spec(arg->v, m)) { if (match_monitor_spec(arg->v, m)) {
wlr_output_state_set_enabled(&m->pending, true); wlr_output_state_set_enabled(&m->pending, true);
mango_output_commit(m); mango_output_commit(m);
m->only_dpms_off = 0; m->only_sleep = 0;
updatemons(NULL, NULL); updatemons(NULL, NULL);
break; break;
} }
@ -1966,7 +1966,7 @@ int32_t toggle_monitor(const Arg *arg) {
if (match_monitor_spec(arg->v, m)) { if (match_monitor_spec(arg->v, m)) {
wlr_output_state_set_enabled(&m->pending, !m->wlr_output->enabled); wlr_output_state_set_enabled(&m->pending, !m->wlr_output->enabled);
mango_output_commit(m); mango_output_commit(m);
m->only_dpms_off = 0; m->only_sleep = 0;
updatemons(NULL, NULL); updatemons(NULL, NULL);
break; break;
} }
@ -1974,14 +1974,14 @@ int32_t toggle_monitor(const Arg *arg) {
return 0; return 0;
} }
int32_t dpms_off_monitor(const Arg *arg) { int32_t sleep_monitor(const Arg *arg) {
Monitor *m = NULL; Monitor *m = NULL;
wl_list_for_each(m, &mons, link) { wl_list_for_each(m, &mons, link) {
if (match_monitor_spec(arg->v, m)) { if (match_monitor_spec(arg->v, m)) {
wlr_output_state_set_enabled(&m->pending, false); wlr_output_state_set_enabled(&m->pending, false);
mango_output_commit(m); mango_output_commit(m);
m->only_dpms_off = 1; m->only_sleep = 1;
updatemons(NULL, NULL); updatemons(NULL, NULL);
break; break;
} }
@ -1989,13 +1989,13 @@ int32_t dpms_off_monitor(const Arg *arg) {
return 0; return 0;
} }
int32_t dpms_on_monitor(const Arg *arg) { int32_t wakeup_monitor(const Arg *arg) {
Monitor *m = NULL; Monitor *m = NULL;
wl_list_for_each(m, &mons, link) { wl_list_for_each(m, &mons, link) {
if (match_monitor_spec(arg->v, m)) { if (match_monitor_spec(arg->v, m)) {
wlr_output_state_set_enabled(&m->pending, true); wlr_output_state_set_enabled(&m->pending, true);
mango_output_commit(m); mango_output_commit(m);
m->only_dpms_off = 0; m->only_sleep = 0;
updatemons(NULL, NULL); updatemons(NULL, NULL);
break; break;
} }
@ -2003,13 +2003,13 @@ int32_t dpms_on_monitor(const Arg *arg) {
return 0; return 0;
} }
int32_t dpms_toggle_monitor(const Arg *arg) { int32_t sleep_toggle_monitor(const Arg *arg) {
Monitor *m = NULL; Monitor *m = NULL;
wl_list_for_each(m, &mons, link) { wl_list_for_each(m, &mons, link) {
if (match_monitor_spec(arg->v, m)) { if (match_monitor_spec(arg->v, m)) {
wlr_output_state_set_enabled(&m->pending, !m->wlr_output->enabled); wlr_output_state_set_enabled(&m->pending, !m->wlr_output->enabled);
mango_output_commit(m); mango_output_commit(m);
m->only_dpms_off = !m->wlr_output->enabled; m->only_sleep = !m->wlr_output->enabled;
updatemons(NULL, NULL); updatemons(NULL, NULL);
break; break;
} }

8
src/mango.c
View file

@ -588,7 +588,7 @@ struct Monitor {
int32_t isoverview; int32_t isoverview;
int32_t is_jump_mode; int32_t is_jump_mode;
int32_t is_in_hotarea; int32_t is_in_hotarea;
int32_t only_dpms_off; int32_t only_sleep;
uint32_t visible_clients; uint32_t visible_clients;
uint32_t visible_tiling_clients; uint32_t visible_tiling_clients;
uint32_t visible_scroll_tiling_clients; uint32_t visible_scroll_tiling_clients;
@ -5164,7 +5164,7 @@ outputmgrapplyortest(struct wlr_output_configuration_v1 *config, int32_t test) {
/* Ensure displays previously disabled by /* Ensure displays previously disabled by
* wlr-output-power-management-v1 are properly handled*/ * wlr-output-power-management-v1 are properly handled*/
m->only_dpms_off = 0; m->only_sleep = 0;
wlr_output_state_init(&state); wlr_output_state_init(&state);
wlr_output_state_set_enabled(&state, config_head->state.enabled); wlr_output_state_set_enabled(&state, config_head->state.enabled);
@ -5314,7 +5314,7 @@ void powermgrsetmode(struct wl_listener *listener, void *data) {
wlr_output_state_set_enabled(&m->pending, event->mode); wlr_output_state_set_enabled(&m->pending, event->mode);
mango_output_commit(m); mango_output_commit(m);
m->only_dpms_off = !event->mode; m->only_sleep = !event->mode;
updatemons(NULL, NULL); updatemons(NULL, NULL);
} }
@ -6967,7 +6967,7 @@ void updatemons(struct wl_listener *listener, void *data) {
m->wlr_output); m->wlr_output);
config_head->state.enabled = 0; config_head->state.enabled = 0;
if (m->only_dpms_off) { if (m->only_sleep) {
continue; continue;
} }
/* Remove this output from the layout to avoid cursor enter inside /* Remove this output from the layout to avoid cursor enter inside