mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2026-04-07 08:21:20 -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

31
src/main.c
View file

@ -130,7 +130,6 @@ send_signal_to_labwc_pid(int signal)
}
struct idle_ctx {
struct server *server;
const char *primary_client;
const char *startup_cmd;
};
@ -143,16 +142,16 @@ idle_callback(void *data)
/* Start session-manager if one is specified by -S|--session */
if (ctx->primary_client) {
ctx->server->primary_client_pid = spawn_primary_client(ctx->primary_client);
if (ctx->server->primary_client_pid < 0) {
g_server.primary_client_pid = spawn_primary_client(ctx->primary_client);
if (g_server.primary_client_pid < 0) {
wlr_log(WLR_ERROR, "fatal error starting primary client: %s",
ctx->primary_client);
wl_display_terminate(ctx->server->wl_display);
wl_display_terminate(g_server.wl_display);
return;
}
}
session_autostart_init(ctx->server);
session_autostart_init();
if (ctx->startup_cmd) {
spawn_async_no_shell(ctx->startup_cmd);
}
@ -255,35 +254,33 @@ main(int argc, char *argv[])
increase_nofile_limit();
struct server *server = &g_server;
server_init(server);
server_start(server);
server_init();
server_start();
struct theme theme = { 0 };
theme_init(&theme, server, rc.theme_name);
theme_init(&theme, rc.theme_name);
rc.theme = &theme;
server->theme = &theme;
g_server.theme = &theme;
menu_init(server);
menu_init();
/* Delay startup of applications until the event loop is ready */
struct idle_ctx idle_ctx = {
.server = server,
.primary_client = primary_client,
.startup_cmd = startup_cmd
};
wl_event_loop_add_idle(server->wl_event_loop, idle_callback, &idle_ctx);
wl_event_loop_add_idle(g_server.wl_event_loop, idle_callback, &idle_ctx);
wl_display_run(server->wl_display);
wl_display_run(g_server.wl_display);
session_shutdown(server);
session_shutdown();
menu_finish(server);
menu_finish();
theme_finish(&theme);
rcxml_finish();
font_finish();
server_finish(server);
server_finish();
return 0;
}