alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

ipc: Store socketname in SWAYSOCK. Fixes --get-socketpath.

Browse source 
After adding pid to the socket path the `--get-socketpath` command broke
because it doesn't know the pid of the running instance. Fix this by
setting and querying `SWAYSOCK`.

Also ignore `SWAYSOCK` upon normal startup if a socket exists at that
location (ie. from another sway instance), and don't overwrite `I3SOCK`
if it exists either.
This commit is contained in:
S. Christoffer Eliesen 2015-11-13 17:53:46 +01:00
parent 2cc6d39d46
commit f64b7e71d4
2 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
sway/ipc.c
View file

@ -52,7 +52,8 @@ void ipc_init(void) {
ipc_sockaddr = ipc_user_sockaddr(); ipc_sockaddr = ipc_user_sockaddr();
if (getenv("SWAYSOCK") != NULL) { // We want to use socket name set by user, not existing socket from another sway instance.
if (getenv("SWAYSOCK") != NULL && access(getenv("SWAYSOCK"), F_OK) == -1) {
strncpy(ipc_sockaddr->sun_path, getenv("SWAYSOCK"), sizeof(ipc_sockaddr->sun_path)); strncpy(ipc_sockaddr->sun_path, getenv("SWAYSOCK"), sizeof(ipc_sockaddr->sun_path));
} }
@ -66,7 +67,12 @@ void ipc_init(void) {
} }
// Set i3 IPC socket path so that i3-msg works out of the box // Set i3 IPC socket path so that i3-msg works out of the box
setenv("I3SOCK", ipc_sockaddr->sun_path, 1); if (!getenv("I3SOCK")) {
setenv("I3SOCK", ipc_sockaddr->sun_path, 1);
}
if (!getenv("SWAYSOCK")) {
setenv("SWAYSOCK", ipc_sockaddr->sun_path, 1);
}
ipc_client_list = create_list(); ipc_client_list = create_list();

11
sway/main.c
View file

@ -107,10 +107,13 @@ int main(int argc, char **argv) {
verbose = 1; verbose = 1;
break; break;
case 'p': ; // --get-socketpath case 'p': ; // --get-socketpath
struct sockaddr_un *ipc_sockaddr = ipc_user_sockaddr(); if (getenv("SWAYSOCK")) {
fprintf(stdout, "%s\n", ipc_sockaddr->sun_path); fprintf(stdout, "%s\n", getenv("SWAYSOCK"));
free(ipc_sockaddr); exit(0);
exit(0); } else {
fprintf(stderr, "sway socket not detected.\n");
exit(1);
}
break; break;
} }
} }