Mirrors/gBar
1
0
Fork 0
mirror of https://github.com/scorpion-26/gBar.git synced 2024-11-24 04:02:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

Use new Hyprland socket.

Browse source 
As of https://github.com/hyprwm/Hyprland/pull/5788 Hyprland no longer
supports "/tmp/hypr/$HYPRLAND_INSTANCE_SIGNATURE/.socket.sock". Instead,
the socket is now located at
"$XDG_RUNTIME_DIR/hypr/$HYPRLAND_INSTANCE_SIGNATURE/.socket.sock".
gBar now tries both of the socket locations and uses the one, where the socket file exists
This commit is contained in:
scorpion-26 2024-05-03 22:27:26 +02:00
parent 05993b8210
commit 89585255fd
1 changed files with 34 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
src/Workspaces.cpp
View file

@ -80,11 +80,40 @@ namespace Workspaces
} }
} }
std::string GetSocketPath()
{
const char* instanceSignature = getenv("HYPRLAND_INSTANCE_SIGNATURE");
const char* xdgRuntimeDir = getenv("XDG_RUNTIME_DIR");
if (!instanceSignature || !xdgRuntimeDir)
{
return "";
}
// First try $XDG_RUNTIME_DIR/hypr/.../. This is the new dir.
std::string socketPath = std::string(xdgRuntimeDir) + "/hypr/" + instanceSignature + "/.socket.sock";
if (std::filesystem::exists(socketPath))
{
return socketPath;
}
// Next try /tmp/hypr/.../. This is removed as of https://github.com/hyprwm/Hyprland/pull/5788
socketPath = "/tmp/hypr/" + std::string(instanceSignature) + "/.socket.sock";
if (std::filesystem::exists(socketPath))
{
return socketPath;
}
return "";
}
std::string DispatchIPC(const std::string& arg) std::string DispatchIPC(const std::string& arg)
{ {
int hyprSocket = socket(AF_UNIX, SOCK_STREAM, 0); int hyprSocket = socket(AF_UNIX, SOCK_STREAM, 0);
const char* instanceSignature = getenv("HYPRLAND_INSTANCE_SIGNATURE"); std::string socketPath = GetSocketPath();
std::string socketPath = "/tmp/hypr/" + std::string(instanceSignature) + "/.socket.sock"; if (socketPath == "")
{
LOG("Error: Couldn't find the Hyprland socket!");
return "";
}
sockaddr_un addr = {}; sockaddr_un addr = {};
addr.sun_family = AF_UNIX; addr.sun_family = AF_UNIX;
@ -98,7 +127,7 @@ namespace Workspaces
5, "connect"); 5, "connect");
if (ret < 0) if (ret < 0)
{ {
LOG("Couldn't connect to Hyprland socket."); LOG("Error: Couldn't connect to Hyprland socket.");
return ""; return "";
} }
@ -110,7 +139,7 @@ namespace Workspaces
5, "write"); 5, "write");
if (written < 0) if (written < 0)
{ {
LOG("Couldn't write to Hyprland socket."); LOG("Error: Couldn't write to Hyprland socket.");
return ""; return "";
} }
char buf[2056]; char buf[2056];
@ -130,7 +159,7 @@ namespace Workspaces
} }
if (bytesRead < 0) if (bytesRead < 0)
{ {
LOG("Couldn't read from Hyprland socket."); LOG("Error: Couldn't read from Hyprland socket.");
return ""; return "";
} }
res += std::string(buf, bytesRead); res += std::string(buf, bytesRead);