Make path configurable

This commit is contained in:
Michael Stapelberg
2009-07-28 22:09:53 +02:00
parent c56dc0f966
commit e7bf93163d
4 changed files with 17 additions and 8 deletions

View File

@ -408,6 +408,11 @@ void load_configuration(xcb_connection_t *conn, const char *override_configpath,
continue;
}
if (strcasecmp(key, "ipc-socket") == 0) {
config.ipc_socket_path = sstrdup(value);
continue;
}
die("Unknown configfile option: %s\n", key);
}
/* now grab all keys again */

View File

@ -370,13 +370,15 @@ int main(int argc, char *argv[], char *env[]) {
}
/* Create the UNIX domain socket for IPC */
int ipc_socket = ipc_create_socket("/tmp/i3.s");
if (ipc_socket == -1) {
LOG("Could not create the IPC socket, IPC disabled\n");
} else {
struct ev_io *ipc_io = scalloc(sizeof(struct ev_io));
ev_io_init(ipc_io, ipc_new_client, ipc_socket, EV_READ);
ev_io_start(loop, ipc_io);
if (config.ipc_socket_path != NULL) {
int ipc_socket = ipc_create_socket(config.ipc_socket_path);
if (ipc_socket == -1) {
LOG("Could not create the IPC socket, IPC disabled\n");
} else {
struct ev_io *ipc_io = scalloc(sizeof(struct ev_io));
ev_io_init(ipc_io, ipc_new_client, ipc_socket, EV_READ);
ev_io_start(loop, ipc_io);
}
}
/* Handle the events which arrived until now */