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

Allow sway IPC clients to fall back to i3 socket

Browse source
This commit is contained in:
Drew DeVault 2018-03-28 21:21:36 -04:00
parent 3d29d833b1
commit 382e8af418
1 changed files with 25 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
common/ipc-client.c
View file

@ -1,4 +1,4 @@
#define _POSIX_C_SOURCE 2 #define _POSIX_C_SOURCE 200809L
#include <stdio.h> #include <stdio.h>
#include <stdint.h> #include <stdint.h>
#include <stdlib.h> #include <stdlib.h>
@ -14,13 +14,31 @@ static const char ipc_magic[] = {'i', '3', '-', 'i', 'p', 'c'};
static const size_t ipc_header_size = sizeof(ipc_magic)+8; static const size_t ipc_header_size = sizeof(ipc_magic)+8;
char *get_socketpath(void) { char *get_socketpath(void) {
FILE *fp = popen("sway --get-socketpath", "r"); const char *swaysock = getenv("SWAYSOCK");
if (!fp) { if (swaysock) {
return NULL; return strdup(swaysock);
} }
char *line = read_line(fp); FILE *fp = popen("sway --get-socketpath 2>/dev/null", "r");
pclose(fp); if (fp) {
return line; char *line = read_line(fp);
pclose(fp);
if (line && *line) {
return line;
}
}
const char *i3sock = getenv("I3SOCK");
if (i3sock) {
return strdup(i3sock);
}
fp = popen("i3 --get-socketpath 2>/dev/null", "r");
if (fp) {
char *line = read_line(fp);
pclose(fp);
if (line && *line) {
return line;
}
}
return NULL;
} }
int ipc_open_socket(const char *socket_path) { int ipc_open_socket(const char *socket_path) {