Skip to content

Update lookup for Hyprland socket location based on changes from commit a5a6480 of hyprland #3180

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
fooeyround wants to merge 2 commits into from
Closed

Update lookup for Hyprland socket location based on changes from commit a5a6480 of hyprland #3180

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ec3795d
update hyprland socket location
fooeyround Apr 28, 2024
c3022ae
remove extra spacing
fooeyround Apr 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 15 additions & 2 deletions src/modules/hyprland/backend.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,12 @@ void IPC::startIPC() {
std::thread([&]() {
// check for hyprland
const char* his = getenv("HYPRLAND_INSTANCE_SIGNATURE");
const char* xdgRuntimeDir = getenv("XDG_RUNTIME_DIR");

if (xdgRuntimeDir == nullptr) {
spdlog::warn("XDG_RUNTIME_DIR not set, Hyprland IPC will not be available.");
return;
}

if (his == nullptr) {
spdlog::warn("Hyprland is not running, Hyprland IPC will not be available.");
Expand All @@ -41,7 +47,7 @@ void IPC::startIPC() {
addr.sun_family = AF_UNIX;

// socket path, specified by EventManager of Hyprland
std::string socketPath = "/tmp/hypr/" + std::string(his) + "/.socket2.sock";
std::string socketPath = std::string(xdgRuntimeDir) + "/hypr/" + std::string(his) + "/.socket2.sock";

strncpy(addr.sun_path, socketPath.c_str(), sizeof(addr.sun_path) - 1);

Expand Down Expand Up @@ -137,6 +143,13 @@ std::string IPC::getSocket1Reply(const std::string& rq) {
// get the instance signature
auto* instanceSig = getenv("HYPRLAND_INSTANCE_SIGNATURE");

auto* xdgRuntimeDir = getenv("XDG_RUNTIME_DIR");

if (xdgRuntimeDir == nullptr) {
spdlog::warn("XDG_RUNTIME_DIR not set, Hyprland IPC will not be available.");
return "";
}

if (instanceSig == nullptr) {
spdlog::error("Hyprland IPC: HYPRLAND_INSTANCE_SIGNATURE was not set! (Is Hyprland running?)");
return "";
Expand All @@ -147,7 +160,7 @@ std::string IPC::getSocket1Reply(const std::string& rq) {
sockaddr_un serverAddress = {0};
serverAddress.sun_family = AF_UNIX;

std::string socketPath = "/tmp/hypr/" + instanceSigStr + "/.socket.sock";
std::string socketPath = std::string(xdgRuntimeDir) + "/hypr/" + instanceSigStr + "/.socket.sock";

// Use snprintf to copy the socketPath string into serverAddress.sun_path
if (snprintf(serverAddress.sun_path, sizeof(serverAddress.sun_path), "%s", socketPath.c_str()) <
Expand Down