aboutsummaryrefslogtreecommitdiff
path: root/config.c
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2020-08-02 17:28:44 +0000
committerDaniel Eklöf <daniel@ekloef.se>2020-08-02 17:28:44 +0000
commit73b33afff2f219a9feb989a08e1790e41db18d3c (patch)
treeef10126fed29cb0c7f2bc145eaf36557077d7a1c /config.c
parentmain: update --help with correct default path for -s,--server (diff)
parentserver/client: use $WAYLAND_DISPLAY instead of $XDG_SESSION_ID in default socket path (diff)
Merge branch 'socket-path-uses-wayland-display-instead-of-xdg-session-id' into master
Diffstat (limited to 'config.c')
-rw-r--r--config.c13
1 files changed, 8 insertions, 5 deletions
diff --git a/config.c b/config.c
index 50bf8a19..2976c6a4 100644
--- a/config.c
+++ b/config.c
@@ -1188,16 +1188,19 @@ err:
static char *
get_server_socket_path(void)
{
- const char *xdg_session_id = getenv("XDG_SESSION_ID");
const char *xdg_runtime = getenv("XDG_RUNTIME_DIR");
if (xdg_runtime == NULL)
return strdup("/tmp/foot.sock");
- if (xdg_session_id == NULL)
- xdg_session_id = "no-session";
+ const char *wayland_display = getenv("WAYLAND_DISPLAY");
+ if (wayland_display == NULL) {
+ char *path = malloc(strlen(xdg_runtime) + 1 + strlen("foot.sock") + 1);
+ sprintf(path, "%s/foot.sock", xdg_runtime);
+ return path;
+ }
- char *path = malloc(strlen(xdg_runtime) + 1 + strlen("foot-.sock") + strlen(xdg_session_id) + 1);
- sprintf(path, "%s/foot-%s.sock", xdg_runtime, xdg_session_id);
+ char *path = malloc(strlen(xdg_runtime) + 1 + strlen("foot-.sock") + strlen(wayland_display) + 1);
+ sprintf(path, "%s/foot-%s.sock", xdg_runtime, wayland_display);
return path;
}