mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2026-03-04 01:40:39 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

src/config/session.c: Update dbus / systemd activation environment

Browse source 
This allows xdg-desktop-portal-wlr to work out of the box for screen-recording.
If systemd or dbus is not available the environment update will fail gracefully.

This patch will set XDG_CURRENT_DESKTOP=wlroots but a user may change this by
either having the environment variable set before starting labwc or by having
a different value set in ~/.config/labwc/environment.

Based on PR #461 by @Joshua-Ashton
This commit is contained in:
Consolatis 2022-07-28 01:06:56 +02:00 • committed by Johan Malm
parent b8995e45dc
commit d6ea0d68cf
3 changed files with 44 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
docs/environment
View file

@ -1,5 +1,8 @@
# Example environment file # Example environment file
# This allows xdg-desktop-portal-wlr to function (e.g. for screen-recording)
XDG_CURRENT_DESKTOP=wlroots
# Set keyboard layout to Swedish # Set keyboard layout to Swedish
XKB_DEFAULT_LAYOUT=se XKB_DEFAULT_LAYOUT=se

2
docs/labwc.desktop
View file

@ -3,4 +3,4 @@ Name=labwc
Comment=A wayland stacking compositor Comment=A wayland stacking compositor
Exec=labwc Exec=labwc
Type=Application Type=Application
DesktopNames=wlroots

42
src/config/session.c
View file

@ -78,16 +78,51 @@ build_path(const char *dir, const char *filename)
return NULL; return NULL;
} }
int len = strlen(dir) + strlen(filename) + 2; int len = strlen(dir) + strlen(filename) + 2;
char *buffer = calloc(len, 1); char *buffer = calloc(1, len);
strcat(buffer, dir); strcat(buffer, dir);
strcat(buffer, "/"); strcat(buffer, "/");
strcat(buffer, filename); strcat(buffer, filename);
return buffer; return buffer;
} }
static void
update_activation_env(const char *env_keys)
{
if (!getenv("DBUS_SESSION_BUS_ADDRESS")) {
/* Prevent accidentally auto-launching a dbus session */
wlr_log(WLR_INFO, "Not updating dbus execution environment: "
"DBUS_SESSION_BUS_ADDRESS not set");
return;
}
wlr_log(WLR_INFO, "Updating dbus execution environment");
char *cmd;
const char *dbus = "dbus-update-activation-environment ";
const char *systemd = "systemctl --user import-environment ";
cmd = calloc(1, strlen(dbus) + strlen(env_keys) + 1);
strcat(cmd, dbus);
strcat(cmd, env_keys);
spawn_async_no_shell(cmd);
free(cmd);
cmd = calloc(1, strlen(systemd) + strlen(env_keys) + 1);
strcat(cmd, systemd);
strcat(cmd, env_keys);
spawn_async_no_shell(cmd);
free(cmd);
}
void void
session_environment_init(const char *dir) session_environment_init(const char *dir)
{ {
/*
* Set default for XDG_CURRENT_DESKTOP so xdg-desktop-portal-wlr is happy.
* May be overriden either by already having a value set or by the user
* supplied environment file.
*/
setenv("XDG_CURRENT_DESKTOP", "wlroots", 0);
const char *environment = build_path(dir, "environment"); const char *environment = build_path(dir, "environment");
if (!environment) { if (!environment) {
return; return;
@ -99,6 +134,9 @@ session_environment_init(const char *dir)
void void
session_autostart_init(const char *dir) session_autostart_init(const char *dir)
{ {
/* Update dbus and systemd user environment, each may fail gracefully */
update_activation_env("DISPLAY WAYLAND_DISPLAY XDG_CURRENT_DESKTOP");
const char *autostart = build_path(dir, "autostart"); const char *autostart = build_path(dir, "autostart");
if (!autostart) { if (!autostart) {
return; return;
@ -109,7 +147,7 @@ session_autostart_init(const char *dir)
} }
wlr_log(WLR_INFO, "run autostart file %s", autostart); wlr_log(WLR_INFO, "run autostart file %s", autostart);
int len = strlen(autostart) + 4; int len = strlen(autostart) + 4;
char *cmd = calloc(len, 1); char *cmd = calloc(1, len);
strcat(cmd, "sh "); strcat(cmd, "sh ");
strcat(cmd, autostart); strcat(cmd, autostart);
spawn_async_no_shell(cmd); spawn_async_no_shell(cmd);