style: 更新 .clang-format 规则并重新格式化所有源文件
- 重构模块使用新的代码风格 - 老代码 (src 目录下的代码) 继续使用之前的代码风格 通过在需要不同代码风格的目录下放对应 .clang-format 配置文件实现
This commit is contained in:
@@ -1,10 +1,11 @@
|
||||
#pragma once
|
||||
|
||||
#include "wm_types.h"
|
||||
#include <stdbool.h>
|
||||
#include <stddef.h>
|
||||
#include <stdint.h>
|
||||
|
||||
#include "wm_types.h"
|
||||
|
||||
// ========== 核心实体定义 ==========
|
||||
|
||||
typedef struct wm_window_t {
|
||||
@@ -19,8 +20,8 @@ typedef struct wm_window_t {
|
||||
bool fixed_size;
|
||||
|
||||
// 几何信息(均为包含边框后的外框矩形)
|
||||
wm_rect_t float_rect; // floating 模式下记忆的外框矩形
|
||||
wm_rect_t frame_rect; // 当前最终外框矩形(由 layout 或 float_rect 解析)
|
||||
wm_rect_t float_rect; // floating 模式下记忆的外框矩形
|
||||
wm_rect_t frame_rect; // 当前最终外框矩形(由 layout 或 float_rect 解析)
|
||||
|
||||
// 元数据(核心算法不依赖,仅用于规则匹配和服务层展示)
|
||||
char *title;
|
||||
@@ -34,8 +35,8 @@ typedef struct wm_window_t {
|
||||
|
||||
typedef struct wm_workspace_t {
|
||||
wm_workspace_id_t id;
|
||||
wm_output_id_t output_id; // 固定归属某个输出
|
||||
wm_layout_id_t layout_id; // 当前活动布局(可用布局列表中的一个)
|
||||
wm_output_id_t output_id; // 固定归属某个输出
|
||||
wm_layout_id_t layout_id; // 当前活动布局(可用布局列表中的一个)
|
||||
wm_window_id_t focused_window_id;
|
||||
|
||||
// 可用布局列表(启动时根据配置分配,之后固定不变)
|
||||
@@ -48,8 +49,8 @@ typedef struct wm_workspace_t {
|
||||
|
||||
typedef struct wm_output_t {
|
||||
wm_output_id_t id;
|
||||
wm_rect_t geometry; // 输出完整几何(bootstrap 后固定)
|
||||
wm_rect_t workarea; // 可用区域(排除面板等,bootstrap 后固定)
|
||||
wm_rect_t geometry; // 输出完整几何(bootstrap 后固定)
|
||||
wm_rect_t workarea; // 可用区域(排除面板等,bootstrap 后固定)
|
||||
wm_workspace_id_t current_workspace_id;
|
||||
} wm_output_t;
|
||||
|
||||
@@ -80,9 +81,11 @@ typedef struct wm_state_t {
|
||||
|
||||
// 初始化/清理
|
||||
// workspace/output 集合大小在 init 时一次性确定,之后不再变化。
|
||||
void wm_state_init(wm_state_t *state,
|
||||
size_t workspace_count,
|
||||
size_t output_count);
|
||||
void wm_state_init(
|
||||
wm_state_t *state,
|
||||
size_t workspace_count,
|
||||
size_t output_count
|
||||
);
|
||||
void wm_state_shutdown(wm_state_t *state);
|
||||
|
||||
// ========== Workspace 访问 ==========
|
||||
@@ -91,14 +94,18 @@ wm_workspace_t *wm_state_workspace(wm_state_t *state, wm_workspace_id_t id);
|
||||
wm_workspace_t *wm_state_workspace_at(wm_state_t *state, size_t index);
|
||||
size_t wm_state_workspace_count(const wm_state_t *state);
|
||||
bool wm_state_workspace_valid(wm_state_t *state, wm_workspace_id_t id);
|
||||
void wm_state_workspace_set_focused_window(wm_state_t *state,
|
||||
wm_workspace_id_t workspace_id,
|
||||
wm_window_id_t window_id);
|
||||
void wm_state_workspace_set_focused_window(
|
||||
wm_state_t *state,
|
||||
wm_workspace_id_t workspace_id,
|
||||
wm_window_id_t window_id
|
||||
);
|
||||
|
||||
// 查询某个 output 的所有 workspace(只读视图)
|
||||
size_t wm_state_workspace_get_by_output(const wm_state_t *state,
|
||||
wm_output_id_t output_id,
|
||||
wm_workspace_t **out_workspaces);
|
||||
size_t wm_state_workspace_get_by_output(
|
||||
const wm_state_t *state,
|
||||
wm_output_id_t output_id,
|
||||
wm_workspace_t **out_workspaces
|
||||
);
|
||||
|
||||
// ========== Workspace 布局操作 ==========
|
||||
|
||||
@@ -106,16 +113,18 @@ size_t wm_state_workspace_get_by_output(const wm_state_t *state,
|
||||
* 设置 workspace 的可用布局列表。
|
||||
* 仅允许在 bootstrap / 初始化阶段调用;运行时不应修改。
|
||||
*/
|
||||
void wm_workspace_set_layouts(wm_workspace_t *workspace,
|
||||
const wm_layout_id_t *layouts,
|
||||
size_t count);
|
||||
void wm_workspace_set_layouts(
|
||||
wm_workspace_t *workspace,
|
||||
const wm_layout_id_t *layouts,
|
||||
size_t count
|
||||
);
|
||||
|
||||
/*
|
||||
* 获取 workspace 的可用布局列表。
|
||||
* 该列表在 bootstrap 完成后保持不变。
|
||||
*/
|
||||
const wm_layout_id_t *wm_workspace_get_layouts(const wm_workspace_t *workspace,
|
||||
size_t *out_count);
|
||||
const wm_layout_id_t *
|
||||
wm_workspace_get_layouts(const wm_workspace_t *workspace, size_t *out_count);
|
||||
|
||||
/*
|
||||
* 切换到下一个布局(循环)
|
||||
@@ -130,7 +139,10 @@ bool wm_workspace_set_layout_by_index(wm_workspace_t *workspace, size_t index);
|
||||
/*
|
||||
* 切换到指定 ID 的布局(如果该布局在可用列表中)
|
||||
*/
|
||||
bool wm_workspace_set_layout_by_id(wm_workspace_t *workspace, wm_layout_id_t id);
|
||||
bool wm_workspace_set_layout_by_id(
|
||||
wm_workspace_t *workspace,
|
||||
wm_layout_id_t id
|
||||
);
|
||||
|
||||
// ========== Output 访问 ==========
|
||||
|
||||
@@ -143,9 +155,11 @@ bool wm_state_output_valid(wm_state_t *state, wm_output_id_t id);
|
||||
* 这不会修改 output 集合本身,也不会改变 workspace->output_id 绑定。
|
||||
* 调用方必须保证目标 workspace 固定归属于该 output。
|
||||
*/
|
||||
void wm_state_output_set_current_workspace(wm_state_t *state,
|
||||
wm_output_id_t output_id,
|
||||
wm_workspace_id_t workspace_id);
|
||||
void wm_state_output_set_current_workspace(
|
||||
wm_state_t *state,
|
||||
wm_output_id_t output_id,
|
||||
wm_workspace_id_t workspace_id
|
||||
);
|
||||
|
||||
// ========== Window 操作 ==========
|
||||
|
||||
@@ -154,43 +168,81 @@ wm_window_t *wm_state_window_get(wm_state_t *state, wm_window_id_t id);
|
||||
wm_window_t *wm_state_window_at(wm_state_t *state, size_t index);
|
||||
void wm_state_window_remove(wm_state_t *state, wm_window_id_t id);
|
||||
size_t wm_state_window_count(const wm_state_t *state);
|
||||
void wm_state_window_set_workspace(wm_state_t *state, wm_window_id_t window_id,
|
||||
wm_workspace_id_t workspace_id);
|
||||
void wm_state_window_set_geometry_mode(wm_state_t *state,
|
||||
wm_window_id_t window_id,
|
||||
wm_window_geometry_mode_t geometry_mode);
|
||||
void wm_state_window_set_floating(wm_state_t *state, wm_window_id_t window_id,
|
||||
bool floating);
|
||||
void wm_state_window_set_sticky(wm_state_t *state, wm_window_id_t window_id,
|
||||
bool sticky);
|
||||
void wm_state_window_set_urgent(wm_state_t *state, wm_window_id_t window_id,
|
||||
bool urgent);
|
||||
void wm_state_window_set_fixed_size(wm_state_t *state,
|
||||
wm_window_id_t window_id,
|
||||
bool fixed_size);
|
||||
void wm_state_window_set_skip_taskbar(wm_state_t *state,
|
||||
wm_window_id_t window_id,
|
||||
bool skip_taskbar);
|
||||
void wm_state_window_set_float_rect(wm_state_t *state, wm_window_id_t window_id,
|
||||
wm_rect_t float_rect);
|
||||
void wm_state_window_set_frame_rect(wm_state_t *state, wm_window_id_t window_id,
|
||||
wm_rect_t frame_rect);
|
||||
bool wm_state_window_set_title(wm_state_t *state, wm_window_id_t window_id,
|
||||
const char *title);
|
||||
bool wm_state_window_set_app_id(wm_state_t *state, wm_window_id_t window_id,
|
||||
const char *app_id);
|
||||
bool wm_state_window_set_class(wm_state_t *state, wm_window_id_t window_id,
|
||||
const char *class_name);
|
||||
bool wm_state_window_set_instance(wm_state_t *state, wm_window_id_t window_id,
|
||||
const char *instance_name);
|
||||
void wm_state_window_set_workspace(
|
||||
wm_state_t *state,
|
||||
wm_window_id_t window_id,
|
||||
wm_workspace_id_t workspace_id
|
||||
);
|
||||
void wm_state_window_set_geometry_mode(
|
||||
wm_state_t *state,
|
||||
wm_window_id_t window_id,
|
||||
wm_window_geometry_mode_t geometry_mode
|
||||
);
|
||||
void wm_state_window_set_floating(
|
||||
wm_state_t *state,
|
||||
wm_window_id_t window_id,
|
||||
bool floating
|
||||
);
|
||||
void wm_state_window_set_sticky(
|
||||
wm_state_t *state,
|
||||
wm_window_id_t window_id,
|
||||
bool sticky
|
||||
);
|
||||
void wm_state_window_set_urgent(
|
||||
wm_state_t *state,
|
||||
wm_window_id_t window_id,
|
||||
bool urgent
|
||||
);
|
||||
void wm_state_window_set_fixed_size(
|
||||
wm_state_t *state,
|
||||
wm_window_id_t window_id,
|
||||
bool fixed_size
|
||||
);
|
||||
void wm_state_window_set_skip_taskbar(
|
||||
wm_state_t *state,
|
||||
wm_window_id_t window_id,
|
||||
bool skip_taskbar
|
||||
);
|
||||
void wm_state_window_set_float_rect(
|
||||
wm_state_t *state,
|
||||
wm_window_id_t window_id,
|
||||
wm_rect_t float_rect
|
||||
);
|
||||
void wm_state_window_set_frame_rect(
|
||||
wm_state_t *state,
|
||||
wm_window_id_t window_id,
|
||||
wm_rect_t frame_rect
|
||||
);
|
||||
bool wm_state_window_set_title(
|
||||
wm_state_t *state,
|
||||
wm_window_id_t window_id,
|
||||
const char *title
|
||||
);
|
||||
bool wm_state_window_set_app_id(
|
||||
wm_state_t *state,
|
||||
wm_window_id_t window_id,
|
||||
const char *app_id
|
||||
);
|
||||
bool wm_state_window_set_class(
|
||||
wm_state_t *state,
|
||||
wm_window_id_t window_id,
|
||||
const char *class_name
|
||||
);
|
||||
bool wm_state_window_set_instance(
|
||||
wm_state_t *state,
|
||||
wm_window_id_t window_id,
|
||||
const char *instance_name
|
||||
);
|
||||
|
||||
// ========== 查询辅助函数 ==========
|
||||
|
||||
/*
|
||||
* 判断工作区是否可见(某个 output 正在显示它)
|
||||
*/
|
||||
bool wm_state_workspace_is_visible(const wm_state_t *state,
|
||||
wm_workspace_id_t workspace_id);
|
||||
bool wm_state_workspace_is_visible(
|
||||
const wm_state_t *state,
|
||||
wm_workspace_id_t workspace_id
|
||||
);
|
||||
|
||||
/*
|
||||
* 判断窗口是否可见
|
||||
@@ -199,12 +251,16 @@ bool wm_state_workspace_is_visible(const wm_state_t *state,
|
||||
* 2. 否则,窗口的 workspace 固定归属某个 output
|
||||
* 3. 且该 output 当前正显示这个 workspace
|
||||
*/
|
||||
bool wm_state_window_should_be_visible(const wm_state_t *state,
|
||||
const wm_window_t *window);
|
||||
bool wm_state_window_should_be_visible(
|
||||
const wm_state_t *state,
|
||||
const wm_window_t *window
|
||||
);
|
||||
|
||||
/*
|
||||
* 判断窗口是否在特定 output 上可见
|
||||
*/
|
||||
bool wm_state_window_should_be_visible_on_output(const wm_state_t *state,
|
||||
const wm_window_t *window,
|
||||
const wm_output_t *output);
|
||||
bool wm_state_window_should_be_visible_on_output(
|
||||
const wm_state_t *state,
|
||||
const wm_window_t *window,
|
||||
const wm_output_t *output
|
||||
);
|
||||
|
||||
Reference in New Issue
Block a user