aboutsummaryrefslogtreecommitdiff
path: root/backend
diff options
context:
space:
mode:
authorrandom human <random.bored.human@gmail.com>2018-09-18 04:48:35 +0530
committerrandom human <random.bored.human@gmail.com>2018-09-18 05:06:32 +0530
commit572dfcdba7694dc2221dcab2ed8b57615d59ed83 (patch)
tree906836cb39e80a1fd6bfdb784b851e84ea55f2fc /backend
parent8b112730ca8f6abeb3f941dc578b3598878e5480 (diff)
Add support for WLR_SESSION env variable
Valid values are "logind"/"systemd" and "direct". If WLR_SESSION is set, only its value is potentially tried; it will not try any other option.
Diffstat (limited to 'backend')
-rw-r--r--backend/session/session.c21
1 files changed, 18 insertions, 3 deletions
diff --git a/backend/session/session.c b/backend/session/session.c
index 3fcac3e3..041d8f83 100644
--- a/backend/session/session.c
+++ b/backend/session/session.c
@@ -66,10 +66,25 @@ static void handle_display_destroy(struct wl_listener *listener, void *data) {
struct wlr_session *wlr_session_create(struct wl_display *disp) {
struct wlr_session *session = NULL;
- const struct session_impl **iter;
- for (iter = impls; !session && *iter; ++iter) {
- session = (*iter)->create(disp);
+ const char *env_wlr_session = getenv("WLR_SESSION");
+ if (env_wlr_session) {
+ if (!strcmp(env_wlr_session, "logind") || !strcmp(env_wlr_session, "systemd")) {
+ #if defined(WLR_HAS_SYSTEMD) || defined(WLR_HAS_ELOGIND)
+ session = session_logind.create(disp);
+ #else
+ wlr_log(WLR_ERROR, "wlroots is not compiled with logind support");
+ #endif
+ } else if (!strcmp(env_wlr_session, "direct")) {
+ session = session_direct.create(disp);
+ } else {
+ wlr_log(WLR_ERROR, "WLR_SESSION has an invalid value: %s", env_wlr_session);
+ }
+ } else {
+ const struct session_impl **iter;
+ for (iter = impls; !session && *iter; ++iter) {
+ session = (*iter)->create(disp);
+ }
}
if (!session) {