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

style: 禁掉 clang-format 的 AlignConsecutiveAssignments 规则并重新格式化整个项目

Browse Source
This commit is contained in:
Zedhugh Chen
2026-06-24 13:05:56 +08:00
parent 8f671bd755
commit bf3de7fb92
38 changed files with 763 additions and 731 deletions
Download Patch File Download Diff File Expand all files Collapse all files

94
src/bar/bar.c
View File

@@ -61,16 +61,16 @@ void bar_output_add_workspace(
listeners_t *listeners
) {
bar_workspace_config_t workspace_config = {
.cell_padding = VALUE(config->tag_cell_padding_x, config->padding_x),
.cell_padding = VALUE(config->tag_cell_padding_x, config->padding_x),
.indicator_width = VALUE(config->tag_indicator_width, 4),
.bg = VALUE(config->tag_bg, config->bg),
.fg = VALUE(config->tag_fg, config->fg),
.active_bg = config->tag_active_bg,
.active_fg = config->tag_active_fg,
.urgent_bg = config->tag_urgent_bg,
.urgent_fg = config->tag_urgent_fg,
.layout_bg = VALUE(config->layout_bg, config->bg),
.layout_fg = VALUE(config->layout_fg, config->fg),
.bg = VALUE(config->tag_bg, config->bg),
.fg = VALUE(config->tag_fg, config->fg),
.active_bg = config->tag_active_bg,
.active_fg = config->tag_active_fg,
.urgent_bg = config->tag_urgent_bg,
.urgent_fg = config->tag_urgent_fg,
.layout_bg = VALUE(config->layout_bg, config->bg),
.layout_fg = VALUE(config->layout_fg, config->fg),
};
auto item = bar_add_item(
bar_output->output_id,
@@ -78,7 +78,7 @@ void bar_output_add_workspace(
bar_workspace,
&workspace_config
);
item->cell_padding = workspace_config.cell_padding;
item->cell_padding = workspace_config.cell_padding;
item->indicator_width = workspace_config.indicator_width;
bar_workspace_add_listeners(listeners, item->state);
@@ -92,8 +92,8 @@ static void bar_output_add_binding(
bar_binding_config_t binding_config = {
.show_default = config->binding_show_default,
.cell_padding = VALUE(config->binding_padding_x, config->padding_x),
.bg = VALUE(config->binding_mode_bg, config->bg),
.fg = VALUE(config->binding_mode_fg, config->fg),
.bg = VALUE(config->binding_mode_bg, config->bg),
.fg = VALUE(config->binding_mode_fg, config->fg),
};
auto item = bar_add_item(
bar_output->output_id,
@@ -115,24 +115,24 @@ static void bar_output_add_windows(
bar_windows_config_t window_config = {
.cell_padding = VALUE(config->window_padding_x, config->padding_x),
.bg = VALUE(config->window_bg, config->bg),
.fg = VALUE(config->window_fg, config->fg),
.focused_bg = VALUE(config->window_focused_bg, config->bg),
.focused_fg = VALUE(config->window_focused_fg, config->fg),
.bg = VALUE(config->window_bg, config->bg),
.fg = VALUE(config->window_fg, config->fg),
.focused_bg = VALUE(config->window_focused_bg, config->bg),
.focused_fg = VALUE(config->window_focused_fg, config->fg),
};
item->cell_padding = window_config.cell_padding;
item->api = bar_windows;
auto create_state = item->api.create_state;
auto output_id = bar_output->output_id;
auto output_id = bar_output->output_id;
if (create_state) item->state = create_state(output_id, &window_config);
bar_windows_add_listeners(listeners, item->state);
}
void bar_init(bar_t *bar, listeners_t *listeners) {
auto c = &bar->config;
auto c = &bar->config;
bar->ctx = text_context_create(c->font_family, c->font_size, c->dpi);
for (size_t i = 0; i < bar->count; ++i) {
@@ -179,8 +179,8 @@ static inline void bar_item_update(zdwm_bar_item_t *item) {
if (!update) return;
auto update_interval_ms = item->api.update_interval_ms;
auto last_updated_time = item->last_updated_time;
auto now = time_monotonic_ms();
auto last_updated_time = item->last_updated_time;
auto now = time_monotonic_ms();
if (now < last_updated_time + update_interval_ms) return;
item->last_updated_time = now;
@@ -204,7 +204,7 @@ void bar_update(bar_t *bar) {
static void bar_output_layout(bar_output_t *bar_output, text_context_t *ctx) {
int32_t start = 0;
auto end = bar_output->width;
auto end = bar_output->width;
auto left = &bar_output->left;
for (size_t i = 0; i < left->count; ++i) {
@@ -219,7 +219,7 @@ static void bar_output_layout(bar_output_t *bar_output, text_context_t *ctx) {
bar_x_region_t region = {
.start = start,
.end = start + width + item->cell_padding * 2,
.end = start + width + item->cell_padding * 2,
};
bar_cell_set_region(item, j, region);
@@ -229,25 +229,25 @@ static void bar_output_layout(bar_output_t *bar_output, text_context_t *ctx) {
}
if (left->count) {
left->region.start = left->items[0].region.start;
left->region.end = left->items[left->count - 1].region.end;
left->region.end = left->items[left->count - 1].region.end;
}
auto right = &bar_output->right;
for (size_t i = right->count; i > 0; --i) {
auto item_index = i - 1;
auto item = &right->items[item_index];
auto item = &right->items[item_index];
item->region.end = end;
for (size_t j = item->count; j > 0; --j) {
auto cell_index = j - 1;
auto cell = &item->cells[cell_index];
auto cell = &item->cells[cell_index];
int32_t width = 0;
text_context_get_text_size(ctx, cell->text, &width, nullptr);
bar_x_region_t region = {
.start = end - width - item->cell_padding * 2,
.end = end,
.end = end,
};
bar_cell_set_region(item, cell_index, region);
@@ -257,7 +257,7 @@ static void bar_output_layout(bar_output_t *bar_output, text_context_t *ctx) {
}
if (right->count) {
right->region.start = right->items[0].region.start;
right->region.end = right->items[right->count - 1].region.end;
right->region.end = right->items[right->count - 1].region.end;
}
auto center = &bar_output->center;
@@ -268,7 +268,7 @@ static void bar_output_layout(bar_output_t *bar_output, text_context_t *ctx) {
for (size_t i = 0; i < center->count; ++i) {
bar_x_region_t region = {
.start = start,
.end = start + width + center->cell_padding * 2,
.end = start + width + center->cell_padding * 2,
};
start = region.end;
bar_cell_set_region(center, i, region);
@@ -282,13 +282,13 @@ static void bar_item_draw(
int32_t height
) {
for (size_t i = 0; i < item->count; ++i) {
auto cell = &item->cells[i];
auto cell = &item->cells[i];
auto region = &cell->region;
zdwm_rect_t cell_area = {
.x = region->start,
.y = 0,
.width = region->end - region->start,
.x = region->start,
.y = 0,
.width = region->end - region->start,
.height = height,
};
if (cell_area.width <= 0) {
@@ -300,13 +300,13 @@ static void bar_item_draw(
if (cell->show_indicator) {
auto size = MIN(item->indicator_width, cell_area.width);
size = MIN(size, height);
size = MIN(size, height);
if (size > 0) {
zdwm_rect_t indicator_area = {
.x = region->start,
.y = 0,
.width = size,
.x = region->start,
.y = 0,
.width = size,
.height = size,
};
draw_background(cr, &cell->fg, indicator_area);
@@ -314,9 +314,9 @@ static void bar_item_draw(
}
zdwm_rect_t text_area = {
.x = cell_area.x + item->cell_padding,
.y = 0,
.width = cell_area.width - item->cell_padding * 2,
.x = cell_area.x + item->cell_padding,
.y = 0,
.width = cell_area.width - item->cell_padding * 2,
.height = height,
};
if (text_area.width > 0 && cell->text && cell->text[0] != '\0') {
@@ -368,9 +368,9 @@ bar_output_draw(bar_output_t *bar_output, text_context_t *ctx, color_t *bg) {
clean_cairo_context(cr);
zdwm_rect_t output_area = {
.x = 0,
.y = 0,
.width = bar_output->width,
.x = 0,
.y = 0,
.width = bar_output->width,
.height = bar_output->height,
};
draw_background(cr, bg, output_area);
@@ -418,12 +418,12 @@ static inline bool bar_item_click(
auto cell = &item->cells[i];
if (cell->region.start <= x && cell->region.end >= x) {
zdwm_bar_click_params_t params = {
.item = item,
.item = item,
.cell_index = i,
.x = x,
.modifiers = info.modifiers,
.button = info.button,
.state = item->state,
.x = x,
.modifiers = info.modifiers,
.button = info.button,
.state = item->state,
};
*action = item->api.on_click(&params);
return true;

16
src/bar/binding.c
View File

@@ -25,7 +25,7 @@ bar_binding_create_state(zdwm_output_id_t output_id, void *config) {
const bar_binding_config_t *bar_config = config;
assert(bar_config);
auto state = p_new(bar_binding_state_t, 1);
auto state = p_new(bar_binding_state_t, 1);
state->config = *bar_config;
return state;
@@ -40,7 +40,7 @@ static void bar_binding_update(
if (!data->inited || !data->dirty) return;
auto config = &data->config;
auto mode = &data->mode;
auto mode = &data->mode;
if (!config->show_default && mode->is_default_mode) {
cells->set_cell_count(item, 0);
@@ -57,7 +57,7 @@ static void bar_binding_update(
static zdwm_action_t bar_binding_on_click(zdwm_bar_click_params_t *params) {
return (zdwm_action_t){
.type = ZDWM_ACTION_BINDING_MODE_CYCLE,
.type = ZDWM_ACTION_BINDING_MODE_CYCLE,
.as.binding_mode_cycle = {.delta = 1},
};
}
@@ -70,10 +70,10 @@ static void bar_binding_destroy_state(void *state) {
}
zdwm_bar_item_type_t bar_binding = {
.create_state = bar_binding_create_state,
.update = bar_binding_update,
.on_click = bar_binding_on_click,
.destroy_state = bar_binding_destroy_state,
.create_state = bar_binding_create_state,
.update = bar_binding_update,
.on_click = bar_binding_on_click,
.destroy_state = bar_binding_destroy_state,
.update_interval_ms = 0,
};
@@ -84,7 +84,7 @@ bar_binding_mode_notify(zdwm_binding_mode_notify_t mode, void *user_data) {
state->mode = mode;
state->inited = true;
state->dirty = true;
state->dirty = true;
return;
}

18
src/bar/cell.c
View File

@@ -78,19 +78,23 @@ static void
bar_cell_set_icon(zdwm_bar_item_t *item, size_t index, zdwm_icon_t icon) {
if (index >= item->count) return;
auto cell = &item->cells[index];
auto cell = &item->cells[index];
auto icon_ptr = &cell->icon;
if (icon_ptr->type == icon.type) {
switch (icon.type) {
case ZDWM_ICON_TEXT:
if (icon_ptr->as.text == icon.as.text ||
strcmp(icon_ptr->as.text, icon.as.text) == 0) {
if (
icon_ptr->as.text == icon.as.text ||
strcmp(icon_ptr->as.text, icon.as.text) == 0
) {
return;
}
case ZDWM_ICON_IMAGE:
if (icon_ptr->as.image_path == icon.as.image_path ||
strcmp(icon_ptr->as.image_path, icon.as.image_path) == 0) {
if (
icon_ptr->as.image_path == icon.as.image_path ||
strcmp(icon_ptr->as.image_path, icon.as.image_path) == 0
) {
return;
}
}
@@ -115,6 +119,7 @@ bar_cell_set_indicator(zdwm_bar_item_t *item, size_t index, bool show) {
item->dirty = true;
}
/* clang-format off */
zdwm_bar_cell_api_t bar_cell_api = {
.get_cell_count = bar_cell_get_count,
.set_cell_count = bar_cell_set_count,
@@ -124,6 +129,7 @@ zdwm_bar_cell_api_t bar_cell_api = {
.cell_set_icon = bar_cell_set_icon,
.cell_set_indicator = bar_cell_set_indicator,
};
/* clang-format on */
void bar_cell_set_region(
zdwm_bar_item_t *item,
@@ -133,7 +139,7 @@ void bar_cell_set_region(
if (index >= item->count) return;
auto cell = &item->cells[index];
auto r = &cell->region;
auto r = &cell->region;
if (r->start == region.start && r->end == region.end) return;

8
src/bar/text.c
View File

@@ -41,10 +41,10 @@ text_context_create(const char *family, uint32_t size, uint32_t dpi) {
g_object_unref(fontmap);
auto ctx = p_new(text_context_t, 1);
*ctx = (text_context_t){
.context = context,
.layout = layout,
.attr_list = attr_list,
*ctx = (text_context_t){
.context = context,
.layout = layout,
.attr_list = attr_list,
};
return ctx;

26
src/bar/windows.c
View File

@@ -39,10 +39,10 @@ bar_windows_create_state(zdwm_output_id_t output_id, void *config) {
const bar_windows_config_t *windows_config = config;
assert(windows_config);
auto state = p_new(bar_windows_state_t, 1);
state->output_id = output_id;
auto state = p_new(bar_windows_state_t, 1);
state->output_id = output_id;
state->workspace_id = ZDWM_WORKSPACE_ID_INVALID;
state->config = *windows_config;
state->config = *windows_config;
return state;
}
@@ -62,14 +62,14 @@ static void bar_windows_update(
if (win->workspace != data->workspace_id || win->skip_taskbar) continue;
auto window = array_push(windows, count, capacity);
*window = *win;
*window = *win;
}
cells->set_cell_count(item, count);
for (size_t i = 0; i < count; ++i) {
auto window = &windows[i];
auto bg = window->focused ? data->config.focused_bg : data->config.bg;
auto fg = window->focused ? data->config.focused_fg : data->config.fg;
auto bg = window->focused ? data->config.focused_bg : data->config.bg;
auto fg = window->focused ? data->config.focused_fg : data->config.fg;
cells->cell_set_text(item, i, window->title);
cells->cell_set_bg(item, i, bg);
cells->cell_set_fg(item, i, fg);
@@ -87,9 +87,9 @@ static void bar_windows_destroy_state(void *state) {
}
zdwm_bar_item_type_t bar_windows = {
.create_state = bar_windows_create_state,
.update = bar_windows_update,
.destroy_state = bar_windows_destroy_state,
.create_state = bar_windows_create_state,
.update = bar_windows_update,
.destroy_state = bar_windows_destroy_state,
.update_interval_ms = 0,
};
@@ -105,14 +105,14 @@ static void bar_windows_workspace_active(
state->workspace_id = workspace_id;
state->workspace_inited = true;
state->dirty = true;
state->dirty = true;
}
static void
bar_windows_add_window(const zdwm_window_t *window, void *user_data) {
bar_windows_state_t *state = user_data;
auto win = array_push(state->windows, state->count, state->capacity);
*win = *window;
*win = *window;
state->dirty = true;
}
@@ -134,7 +134,7 @@ bar_windows_update_window(const zdwm_window_t *window, void *user_data) {
bar_windows_state_t *state = user_data;
auto old_window = state_get_window(state, window->id);
*old_window = *window;
*old_window = *window;
state->dirty = true;
}
@@ -143,7 +143,7 @@ static void
bar_windows_remove_window(zdwm_window_id_t window_id, void *user_data) {
bar_windows_state_t *state = user_data;
bool found = false;
bool found = false;
size_t index = 0;
for (size_t i = 0; i < state->count; ++i) {

34
src/bar/workspaces.c
View File

@@ -86,10 +86,10 @@ bar_workspaces_create_state(zdwm_output_id_t output_id, void *config) {
const bar_workspace_config_t *workspace_config = config;
assert(workspace_config);
auto state = p_new(bar_workspace_state_t, 1);
state->output_id = output_id;
auto state = p_new(bar_workspace_state_t, 1);
state->output_id = output_id;
state->workspace_id = ZDWM_WORKSPACE_ID_INVALID;
state->config = *workspace_config;
state->config = *workspace_config;
return state;
}
@@ -109,7 +109,7 @@ static void bar_workspaces_update(
auto config = &data->config;
for (size_t i = 0; i < data->count; ++i) {
auto workspace = &data->workspaces[i];
auto info = &workspace->info;
auto info = &workspace->info;
workspace->window_count = state_workspace_get_window_count(state, info->id);
workspace->urgent_window_count =
@@ -145,11 +145,11 @@ static void bar_workspaces_update(
static zdwm_action_t bar_workspace_on_click(zdwm_bar_click_params_t *params) {
auto cell_index = params->cell_index;
auto data = (bar_workspace_state_t *)params->state;
auto data = (bar_workspace_state_t *)params->state;
if (cell_index == data->count) {
return (zdwm_action_t){
.type = ZDWM_ACTION_LAYOUT_CYCLE,
.type = ZDWM_ACTION_LAYOUT_CYCLE,
.as.layout_cycle = {.delta = 1},
};
}
@@ -160,7 +160,7 @@ static zdwm_action_t bar_workspace_on_click(zdwm_bar_click_params_t *params) {
}
return (zdwm_action_t){
.type = ZDWM_ACTION_WORKSPACE_SWITCH,
.type = ZDWM_ACTION_WORKSPACE_SWITCH,
.as.switch_workspace.workspace = workspace->info.id,
};
}
@@ -175,10 +175,10 @@ static void bar_workspace_destroy_state(void *state) {
}
zdwm_bar_item_type_t bar_workspace = {
.create_state = bar_workspaces_create_state,
.update = bar_workspaces_update,
.on_click = bar_workspace_on_click,
.destroy_state = bar_workspace_destroy_state,
.create_state = bar_workspaces_create_state,
.update = bar_workspaces_update,
.on_click = bar_workspace_on_click,
.destroy_state = bar_workspace_destroy_state,
.update_interval_ms = 0,
};
@@ -204,7 +204,7 @@ static void bar_workspace_list_filter(
}
state->list_inited = true;
state->dirty = true;
state->dirty = true;
}
static void bar_workspace_active_updated(
@@ -219,7 +219,7 @@ static void bar_workspace_active_updated(
state->workspace_id = workspace_id;
state->active_inited = true;
state->dirty = true;
state->dirty = true;
}
static void
@@ -230,7 +230,7 @@ bar_workspace_layout_notify(zdwm_layout_notify_t layout, void *user_data) {
auto workspace = &state->workspaces[i];
if (workspace->info.id == layout.workspace) {
workspace->layout = layout;
state->dirty = true;
state->dirty = true;
return;
}
}
@@ -264,14 +264,14 @@ void bar_workspace_window_updated(
auto state = (bar_workspace_state_t *)user_data;
auto old_window = state_get_window(state, window->id);
*old_window = *window;
state->dirty = true;
*old_window = *window;
state->dirty = true;
}
void bar_workspace_window_removed(zdwm_window_id_t window_id, void *user_data) {
auto state = (bar_workspace_state_t *)user_data;
bool found = false;
bool found = false;
size_t index = 0;
for (size_t i = 0; i < state->window_count; ++i) {