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

feat(core/policy): 完善 manage_window 和 switch_workspace 命令处理

Browse Source
This commit is contained in:
Zedhugh Chen
2026-04-22 19:40:09 +08:00
parent 663db3412f
commit d4c03fcfbd
1 changed files with 52 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
src/core/policy.c
View File

@@ -118,6 +118,7 @@ static void manage_window(
auto window = state_window_add(state, &command->info); auto window = state_window_add(state, &command->info);
auto window_id = window->id; auto window_id = window->id;
state_window_set_workspace(state, window_id, command->workspace); state_window_set_workspace(state, window_id, command->workspace);
state_workspace_set_focused_window(state, command->workspace, window_id);
state_window_set_floating(state, window_id, command->floating); state_window_set_floating(state, window_id, command->floating);
if (!state_workspace_show(state, command->workspace)) return; if (!state_workspace_show(state, command->workspace)) return;
@@ -126,13 +127,53 @@ static void manage_window(
.type = ZDWM_EFFECT_MAP_WINDOW, .type = ZDWM_EFFECT_MAP_WINDOW,
.as.map.window = window_id, .as.map.window = window_id,
}; };
effect_t focus_effect = {
.type = ZDWM_EFFECT_FOCUS_WINDOW,
.as.focus.window = window_id,
};
plan_push_effect(plan, &map_effect); plan_push_effect(plan, &map_effect);
plan_push_effect(plan, &focus_effect);
if (window_need_layout(window)) { if (window_need_layout(window)) {
plan->need_relayout = true; plan->need_relayout = true;
} }
} }
static void add_switch_workspace_effects(
const state_t *state,
workspace_id_t old_workspace,
workspace_id_t new_workspace,
plan_t *plan
) {
for (size_t i = 0; i < state->window_count; ++i) {
window_t *window = &state->windows[i];
if (window->sticky) continue;
if (window->workspace_id == old_workspace) {
effect_t unmap_effect = {
.type = ZDWM_EFFECT_UNMAP_WINDOW,
.as.unmap.window = window->id,
};
plan_push_effect(plan, &unmap_effect);
} else if (window->workspace_id == new_workspace) {
effect_t map_effect = {
.type = ZDWM_EFFECT_MAP_WINDOW,
.as.unmap.window = window->id,
};
plan_push_effect(plan, &map_effect);
}
}
const workspace_t *workspace = state_workspace_get(state, new_workspace);
if (!workspace) return;
effect_t focus_effect = {
.type = ZDWM_EFFECT_FOCUS_WINDOW,
.as.focus.window = workspace->focused_window_id
};
plan_push_effect(plan, &focus_effect);
}
static void switch_workspace( static void switch_workspace(
state_t *state, state_t *state,
const switch_workspace_command_t *command, const switch_workspace_command_t *command,
@@ -140,16 +181,19 @@ static void switch_workspace(
) { ) {
auto output_id = command->output; auto output_id = command->output;
auto workspace_id = command->workspace; auto workspace_id = command->workspace;
workspace_id_t old_workspace = ZDWM_WORKSPACE_ID_INVALID;
if (state_output_set_current_workspace(state, output_id, workspace_id)) { if (state_output_set_current_workspace(
state,
output_id,
workspace_id,
&old_workspace
)) {
plan->need_relayout = true; plan->need_relayout = true;
add_switch_workspace_effects(state, old_workspace, workspace_id, plan);
} }
if (state_set_current_output(state, output_id)) { state_set_current_output(state, output_id);
plan->need_relayout = true;
}
/* TODO: 后续考虑加上 ewmh 相关副作用 */
} }
void policy_apply_command( void policy_apply_command(