mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2026-03-23 05:34:52 -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/decorations/kde-deco.c
View file

@ -119,10 +119,10 @@ kde_server_decoration_update_default(void)
}
void
kde_server_decoration_init(struct server *server)
kde_server_decoration_init(void)
{
assert(!kde_deco_mgr);
kde_deco_mgr = wlr_server_decoration_manager_create(server->wl_display);
kde_deco_mgr = wlr_server_decoration_manager_create(g_server.wl_display);
if (!kde_deco_mgr) {
wlr_log(WLR_ERROR, "unable to create the kde server deco manager");
exit(EXIT_FAILURE);
@ -131,12 +131,12 @@ kde_server_decoration_init(struct server *server)
wl_list_init(&decorations);
kde_server_decoration_update_default();
wl_signal_add(&kde_deco_mgr->events.new_decoration, &server->kde_server_decoration);
server->kde_server_decoration.notify = handle_new_server_decoration;
wl_signal_add(&kde_deco_mgr->events.new_decoration, &g_server.kde_server_decoration);
g_server.kde_server_decoration.notify = handle_new_server_decoration;
}
void
kde_server_decoration_finish(struct server *server)
kde_server_decoration_finish(void)
{
wl_list_remove(&server->kde_server_decoration.link);
wl_list_remove(&g_server.kde_server_decoration.link);
}

12
src/decorations/xdg-deco.c
View file

@ -115,22 +115,22 @@ xdg_toplevel_decoration(struct wl_listener *listener, void *data)
}
void
xdg_server_decoration_init(struct server *server)
xdg_server_decoration_init(void)
{
struct wlr_xdg_decoration_manager_v1 *xdg_deco_mgr = NULL;
xdg_deco_mgr = wlr_xdg_decoration_manager_v1_create(server->wl_display);
xdg_deco_mgr = wlr_xdg_decoration_manager_v1_create(g_server.wl_display);
if (!xdg_deco_mgr) {
wlr_log(WLR_ERROR, "unable to create the XDG deco manager");
exit(EXIT_FAILURE);
}
wl_signal_add(&xdg_deco_mgr->events.new_toplevel_decoration,
&server->xdg_toplevel_decoration);
server->xdg_toplevel_decoration.notify = xdg_toplevel_decoration;
&g_server.xdg_toplevel_decoration);
g_server.xdg_toplevel_decoration.notify = xdg_toplevel_decoration;
}
void
xdg_server_decoration_finish(struct server *server)
xdg_server_decoration_finish(void)
{
wl_list_remove(&server->xdg_toplevel_decoration.link);
wl_list_remove(&g_server.xdg_toplevel_decoration.link);
}