mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2025-11-01 22:58:47 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

server: refactor to avoid *g_server

Browse source 
No functional change intended.
This commit is contained in:
Johan Malm 2024-04-21 15:47:24 +01:00 • committed by Consolatis
parent 858e1c65cf
commit 48e6c0009c
1 changed files with 13 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/server.c
View file

@ -45,34 +45,34 @@ static struct wl_event_source *sigint_source;
static struct wl_event_source *sigterm_source; static struct wl_event_source *sigterm_source;
static struct wl_event_source *sigchld_source; static struct wl_event_source *sigchld_source;
static struct server *g_server;
static void static void
reload_config_and_theme(void) reload_config_and_theme(struct server *server)
{ {
rcxml_finish(); rcxml_finish();
rcxml_read(rc.config_file); rcxml_read(rc.config_file);
theme_finish(g_server->theme); theme_finish(server->theme);
theme_init(g_server->theme, rc.theme_name); theme_init(server->theme, rc.theme_name);
struct view *view; struct view *view;
wl_list_for_each(view, &g_server->views, link) { wl_list_for_each(view, &server->views, link) {
view_reload_ssd(view); view_reload_ssd(view);
} }
menu_reconfigure(g_server); menu_reconfigure(server);
seat_reconfigure(g_server); seat_reconfigure(server);
regions_reconfigure(g_server); regions_reconfigure(server);
resize_indicator_reconfigure(g_server); resize_indicator_reconfigure(server);
kde_server_decoration_update_default(); kde_server_decoration_update_default();
} }
static int static int
handle_sighup(int signal, void *data) handle_sighup(int signal, void *data)
{ {
struct server *server = data;
session_environment_init(); session_environment_init();
reload_config_and_theme(); reload_config_and_theme(server);
output_virtual_update_fallback(g_server); output_virtual_update_fallback(server);
return 0; return 0;
} }
@ -308,7 +308,7 @@ server_init(struct server *server)
struct wl_event_loop *event_loop = NULL; struct wl_event_loop *event_loop = NULL;
event_loop = wl_display_get_event_loop(server->wl_display); event_loop = wl_display_get_event_loop(server->wl_display);
sighup_source = wl_event_loop_add_signal( sighup_source = wl_event_loop_add_signal(
event_loop, SIGHUP, handle_sighup, NULL); event_loop, SIGHUP, handle_sighup, server);
sigint_source = wl_event_loop_add_signal( sigint_source = wl_event_loop_add_signal(
event_loop, SIGINT, handle_sigterm, server->wl_display); event_loop, SIGINT, handle_sigterm, server->wl_display);
sigterm_source = wl_event_loop_add_signal( sigterm_source = wl_event_loop_add_signal(
@ -554,8 +554,6 @@ server_init(struct server *server)
#if HAVE_XWAYLAND #if HAVE_XWAYLAND
xwayland_server_init(server, compositor); xwayland_server_init(server, compositor);
#endif #endif
/* used when handling SIGHUP */
g_server = server;
} }
void void