diff options
| author | Daniel Eklöf <daniel@ekloef.se> | 2020-03-09 17:49:44 +0000 |
|---|---|---|
| committer | Daniel Eklöf <daniel@ekloef.se> | 2020-03-09 17:49:44 +0000 |
| commit | fc7b3b2d85cc3cff87c367cb9022a3d049b9dcec (patch) | |
| tree | 0b968b01b339b6af3806fe11aab6b2d88f73fd22 /client.c | |
| parent | footrc: add default key bindings (diff) | |
| parent | server/client: add XDG_SESSION_ID to the default socket path (diff) | |
Merge branch 'master' into bindings
Diffstat (limited to 'client.c')
| -rw-r--r-- | client.c | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -135,10 +135,13 @@ main(int argc, char *const *argv) } else { bool connected = false; + const char *xdg_session_id = getenv("XDG_SESSION_ID"); const char *xdg_runtime = getenv("XDG_RUNTIME_DIR"); if (xdg_runtime != NULL) { - snprintf(addr.sun_path, sizeof(addr.sun_path), "%s/foot.sock", xdg_runtime); + if (xdg_session_id == NULL) + xdg_session_id = "<no-session>"; + snprintf(addr.sun_path, sizeof(addr.sun_path), "%s/foot-%s.sock", xdg_runtime, xdg_session_id); if (connect(fd, (const struct sockaddr *)&addr, sizeof(addr)) == 0) connected = true; else |
