tree-wide: auto-replace of (struct server *)

#!/bin/bash
    read -r -d '' EXPRS << EOF
    s/xwayland->server/xwayland->svr/g;

    s/\t*struct server \*server;\n//g;
    s/\t*struct server \*server =.*?;\n//gs;
    s/\t*.* = ([a-z_]*->)*server[;,]\n//g;
    s/\{\n\n/\{\n/g;
    s/\n\n+/\n\n/g;

    s/\(\s*struct server \*server\)/(void)/g;
    s/\(\s*struct server \*server,\s*/(/g;
    s/,\s*struct server \*server\)/)/g;
    s/,\s*struct server \*server,\s*/, /g;

    s/\(\s*([a-z_]*->)*server\)/()/g;
    s/\(\s*([a-z_]*->)*server,\s*/(/g;
    s/,\s*([a-z_]*->)*server\)/)/g;
    s/,\s*([a-z_]*->)*server,\s*/, /g;

    s/([a-z_]*->)*server->/g_server./g;

    s/xwayland->svr/xwayland->server/g;
    EOF

    find src include \( -name \*.c -o -name \*.h \) -exec \
        perl -0777 -i -pe "$EXPRS" \{\} \;
This commit is contained in:
John Lindgren 2026-02-23 11:56:39 -05:00 committed by Johan Malm
parent 60ac8f07bb
commit cb49bddf63
81 changed files with 1522 additions and 1682 deletions

View file

@ -328,7 +328,7 @@ subtract_node_tree(struct wlr_scene_tree *tree, pixman_region32_t *available,
}
void
edges_calculate_visibility(struct server *server, struct view *ignored_view)
edges_calculate_visibility(struct view *ignored_view)
{
/*
* The region stores the available output layout space
@ -353,17 +353,17 @@ edges_calculate_visibility(struct server *server, struct view *ignored_view)
*/
struct output *output;
struct wlr_box layout_box;
wl_list_for_each(output, &server->outputs, link) {
wl_list_for_each(output, &g_server.outputs, link) {
if (!output_is_usable(output)) {
continue;
}
wlr_output_layout_get_box(server->output_layout,
wlr_output_layout_get_box(g_server.output_layout,
output->wlr_output, &layout_box);
pixman_region32_union_rect(&region, &region,
layout_box.x, layout_box.y, layout_box.width, layout_box.height);
}
subtract_node_tree(&server->scene->tree, &region, ignored_view);
subtract_node_tree(&g_server.scene->tree, &region, ignored_view);
pixman_region32_fini(&region);
}
@ -389,7 +389,7 @@ edges_find_neighbors(struct border *nearest_edges, struct view *view,
edges_for_target_geometry(&target_edges, view, target);
struct view *v;
for_each_view(v, &view->server->views, LAB_VIEW_CRITERIA_CURRENT_WORKSPACE) {
for_each_view(v, &g_server.views, LAB_VIEW_CRITERIA_CURRENT_WORKSPACE) {
if (v == view || v->minimized || !output_is_usable(v->output)) {
continue;
}
@ -447,7 +447,7 @@ edges_find_outputs(struct border *nearest_edges, struct view *view,
edges_for_target_geometry(&target_edges, view, target);
struct output *o;
wl_list_for_each(o, &view->server->outputs, link) {
wl_list_for_each(o, &g_server.outputs, link) {
if (!output_is_usable(o)) {
continue;
}