mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2026-04-04 07:15:41 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
#!/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
Download patch file Download diff file Expand all files Collapse all files

12
src/placement.c
View file

@ -46,8 +46,6 @@ count_views(struct view *view)
{
assert(view);
struct server *server = view->server;
struct output *output = view->output;
if (!output_is_usable(output)) {
return 0;
@ -56,7 +54,7 @@ count_views(struct view *view)
int nviews = 0;
struct view *v;
for_each_view(v, &server->views, LAB_VIEW_CRITERIA_CURRENT_WORKSPACE) {
for_each_view(v, &g_server.views, LAB_VIEW_CRITERIA_CURRENT_WORKSPACE) {
/* Ignore the target view or anything on a different output */
if (v == view || v->output != output) {
continue;
@ -105,8 +103,6 @@ build_grid(struct overlap_bitmap *bmp, struct view *view)
assert(bmp);
assert(view);
struct server *server = view->server;
/* Always start with a fresh bitmap */
destroy_bitmap(bmp);
@ -145,7 +141,7 @@ build_grid(struct overlap_bitmap *bmp, struct view *view)
int nr_cols = 2;
struct view *v;
for_each_view(v, &server->views, LAB_VIEW_CRITERIA_CURRENT_WORKSPACE) {
for_each_view(v, &g_server.views, LAB_VIEW_CRITERIA_CURRENT_WORKSPACE) {
if (v == view || v->output != output) {
continue;
}
@ -236,8 +232,6 @@ build_overlap(struct overlap_bitmap *bmp, struct view *view)
assert(bmp);
assert(view);
struct server *server = view->server;
if (bmp->nr_rows < 1 || bmp->nr_cols < 1) {
return;
}
@ -248,7 +242,7 @@ build_overlap(struct overlap_bitmap *bmp, struct view *view)
}
struct view *v;
for_each_view(v, &server->views, LAB_VIEW_CRITERIA_CURRENT_WORKSPACE) {
for_each_view(v, &g_server.views, LAB_VIEW_CRITERIA_CURRENT_WORKSPACE) {
if (v == view || v->output != output) {
continue;
}