diff --git a/src/bridge/bridge-unix-sockets.cpp b/src/bridge/bridge-unix-sockets.cpp index e53e721..8a78bc3 100644 --- a/src/bridge/bridge-unix-sockets.cpp +++ b/src/bridge/bridge-unix-sockets.cpp @@ -33,6 +33,8 @@ #include #define TMP_DIR "/tmp" +#define XDG_DATA_DIR_DEFAULT ".local/share" +#define SLIMEVR_DATA_DIR "slimevr" #define SOCKET_NAME "SlimeVRDriver" namespace fs = std::filesystem; @@ -156,12 +158,28 @@ bool sendBridgeMessage(messages::ProtobufMessage& message, SlimeVRDriver::VRDriv BridgeStatus runBridgeFrame(SlimeVRDriver::VRDriver& driver) { try { if (!client.IsOpen()) { + fs::path socket; // TODO: do this once in the constructor or something if(const char* ptr = std::getenv("XDG_RUNTIME_DIR")) { const fs::path xdg_runtime = ptr; - client.Open((xdg_runtime / SOCKET_NAME).native()); - } else { - client.Open((fs::path(TMP_DIR) / SOCKET_NAME).native()); + socket = (xdg_runtime / SOCKET_NAME); + } + if(!fs::exists(socket)) { + socket = (fs::path(TMP_DIR) / SOCKET_NAME); + } + // try using home dir if the vrserver is run in a chroot like + if(!fs::exists(socket)) { + if (const char* ptr = std::getenv("XDG_DATA_DIR")) { + const fs::path data_dir = ptr; + socket = (data_dir / SLIMEVR_DATA_DIR / SOCKET_NAME); + } else if (const char* ptr = std::getenv("HOME")) { + const fs::path home = ptr; + socket = (home / XDG_DATA_DIR_DEFAULT / SLIMEVR_DATA_DIR / SOCKET_NAME); + } + } + if(fs::exists(socket)) { + driver.Log("bridge socket: " + std::string(socket)); + client.Open(socket.native()); } } client.UpdateOnce();