zedhugh/zdwm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: 使用 workspace_id_invalid() 替代直接比较 ZDWM_WORKSPACE_ID_INVALID

Browse Source
This commit is contained in:
Zedhugh Chen
2026-05-09 04:09:46 +08:00
parent a60d9f31a7
commit 1f4659e7a4
5 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/config/runtime_config.c
View File

@@ -127,7 +127,7 @@ static bool
rule_action_valid(const rule_action_t *action, size_t workspace_count) { rule_action_valid(const rule_action_t *action, size_t workspace_count) {
if (!action) return false; if (!action) return false;
if (action->workspace == ZDWM_WORKSPACE_ID_INVALID) { if (workspace_id_invalid(action->workspace)) {
return action->switch_to_workspace || action->fullscreen || return action->switch_to_workspace || action->fullscreen ||
action->maximize || action->floating; action->maximize || action->floating;
} }

2
src/core/policy.c
View File

@@ -92,7 +92,7 @@ static void route_map_request(
bool have_rule_match = rules_resolve(rules, &e->metadata, &action); bool have_rule_match = rules_resolve(rules, &e->metadata, &action);
if (have_rule_match) { if (have_rule_match) {
manage_window_command_t *data = &manage_window_cmd.as.manage_window; manage_window_command_t *data = &manage_window_cmd.as.manage_window;
if (action.workspace != ZDWM_WORKSPACE_ID_INVALID) { if (!workspace_id_invalid(action.workspace)) {
data->workspace = action.workspace; data->workspace = action.workspace;
} }
if (action.floating) data->floating = true; if (action.floating) data->floating = true;

2
src/core/rules.c
View File

@@ -55,7 +55,7 @@ rule_match_window(const rule_match_t *match, const window_metadata_t *meta) {
static void rule_action_merge(const rule_action_t *src, rule_action_t *dest) { static void rule_action_merge(const rule_action_t *src, rule_action_t *dest) {
if (!src || !dest) return; if (!src || !dest) return;
if (src->workspace != ZDWM_WORKSPACE_ID_INVALID) { if (!workspace_id_invalid(src->workspace)) {
dest->workspace = src->workspace; dest->workspace = src->workspace;
} }
dest->switch_to_workspace |= src->switch_to_workspace; dest->switch_to_workspace |= src->switch_to_workspace;

4
src/core/state.c
View File

@@ -54,7 +54,7 @@ void state_init(
workspace->layout_count = workspace_desc->layout_count; workspace->layout_count = workspace_desc->layout_count;
workspace->name = p_strdup(workspace_desc->name); workspace->name = p_strdup(workspace_desc->name);
if (output->current_workspace_id == ZDWM_WORKSPACE_ID_INVALID) { if (workspace_id_invalid(output->current_workspace_id)) {
output->current_workspace_id = workspace->id; output->current_workspace_id = workspace->id;
} }
} }
@@ -62,7 +62,7 @@ void state_init(
for (size_t i = 0; i < state->output_count; i++) { for (size_t i = 0; i < state->output_count; i++) {
const output_t *output = &state->outputs[i]; const output_t *output = &state->outputs[i];
if (output->current_workspace_id == ZDWM_WORKSPACE_ID_INVALID) { if (workspace_id_invalid(output->current_workspace_id)) {
fatal("output at index %zu has no workspace", i); fatal("output at index %zu has no workspace", i);
} }
} }

4
src/core/types.h
View File

@@ -105,3 +105,7 @@ typedef struct only_window_data_t {
static inline bool window_id_invalid(window_id_t window_id) { static inline bool window_id_invalid(window_id_t window_id) {
return window_id == ZDWM_WINDOW_ID_INVALID; return window_id == ZDWM_WINDOW_ID_INVALID;
} }
static inline bool workspace_id_invalid(workspace_id_t workspace_id) {
return workspace_id == ZDWM_WORKSPACE_ID_INVALID;
}