hyprwm
/
hyprpaper
mirror of https://github.com/hyprwm/hyprpaper.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

core: move socket to runtime dir (#167)

This commit is contained in:
Vaxry 2024-04-28 22:25:36 +01:00 committed by GitHub
parent 4b3843e283
commit d50f0eda6c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/ipc/Socket.cpp
View File

@ -11,6 +11,7 @@
#include <sys/types.h> #include <sys/types.h>
#include <sys/un.h> #include <sys/un.h>
#include <unistd.h> #include <unistd.h>
#include <pwd.h>
void CIPCSocket::initialize() { void CIPCSocket::initialize() {
std::thread([&]() { std::thread([&]() {
@ -24,12 +25,14 @@ void CIPCSocket::initialize() {
sockaddr_un SERVERADDRESS = {.sun_family = AF_UNIX}; sockaddr_un SERVERADDRESS = {.sun_family = AF_UNIX};
const auto HISenv = getenv("HYPRLAND_INSTANCE_SIGNATURE"); const auto HISenv = getenv("HYPRLAND_INSTANCE_SIGNATURE");
const std::string USERID = std::to_string(getpwuid(getuid())->pw_uid);
std::string socketPath = HISenv ? "/tmp/hypr/" + std::string(HISenv) + "/.hyprpaper.sock" : "/tmp/hypr/.hyprpaper.sock"; const auto USERDIR = "/run/user/" + USERID + "/hypr/";
if (!HISenv) { std::string socketPath = HISenv ? USERDIR + std::string(HISenv) + "/.hyprpaper.sock" : USERDIR + ".hyprpaper.sock";
mkdir("/tmp/hypr", S_IRWXU | S_IRWXG);
} if (!HISenv)
mkdir(USERDIR.c_str(), S_IRWXU);
unlink(socketPath.c_str()); unlink(socketPath.c_str());
@ -92,7 +95,7 @@ bool CIPCSocket::mainThreadParseRequest() {
if (copy == "") if (copy == "")
return false; return false;
// now we can work on the copy // now we can work on the copy
Debug::log(LOG, "Received a request: %s", copy.c_str()); Debug::log(LOG, "Received a request: %s", copy.c_str());
@ -102,7 +105,6 @@ bool CIPCSocket::mainThreadParseRequest() {
m_bReplyReady = true; m_bReplyReady = true;
m_bRequestReady = false; m_bRequestReady = false;
// config commands // config commands
if (copy.find("wallpaper") == 0 || copy.find("preload") == 0 || copy.find("unload") == 0) { if (copy.find("wallpaper") == 0 || copy.find("preload") == 0 || copy.find("unload") == 0) {
@ -114,11 +116,10 @@ bool CIPCSocket::mainThreadParseRequest() {
} }
return true; return true;
} }
if (copy.find("listloaded") == 0) { if (copy.find("listloaded") == 0) {
const auto numWallpapersLoaded = g_pHyprpaper->m_mWallpaperTargets.size(); const auto numWallpapersLoaded = g_pHyprpaper->m_mWallpaperTargets.size();
Debug::log(LOG, "numWallpapersLoaded: %d", numWallpapersLoaded); Debug::log(LOG, "numWallpapersLoaded: %d", numWallpapersLoaded);
@ -126,21 +127,21 @@ bool CIPCSocket::mainThreadParseRequest() {
m_szReply = "no wallpapers loaded"; m_szReply = "no wallpapers loaded";
return false; return false;
} }
m_szReply = ""; m_szReply = "";
long unsigned int i = 0; long unsigned int i = 0;
for (auto& [name, target] : g_pHyprpaper->m_mWallpaperTargets) { for (auto& [name, target] : g_pHyprpaper->m_mWallpaperTargets) {
m_szReply += name; m_szReply += name;
i++; i++;
if (i < numWallpapersLoaded) m_szReply += '\n'; // dont add newline on last entry if (i < numWallpapersLoaded)
m_szReply += '\n'; // dont add newline on last entry
} }
return true; return true;
} }
if (copy.find("listactive") == 0) { if (copy.find("listactive") == 0) {
const auto numWallpapersActive = g_pHyprpaper->m_mMonitorActiveWallpapers.size(); const auto numWallpapersActive = g_pHyprpaper->m_mMonitorActiveWallpapers.size();
Debug::log(LOG, "numWallpapersActive: %d", numWallpapersActive); Debug::log(LOG, "numWallpapersActive: %d", numWallpapersActive);
@ -148,17 +149,17 @@ bool CIPCSocket::mainThreadParseRequest() {
m_szReply = "no wallpapers active"; m_szReply = "no wallpapers active";
return false; return false;
} }
m_szReply = ""; m_szReply = "";
long unsigned int i = 0; long unsigned int i = 0;
for (auto& [mon, path1] : g_pHyprpaper->m_mMonitorActiveWallpapers) { for (auto& [mon, path1] : g_pHyprpaper->m_mMonitorActiveWallpapers) {
m_szReply += mon + " = " + path1; m_szReply += mon + " = " + path1;
i++; i++;
if (i < numWallpapersActive) m_szReply += '\n'; // dont add newline on last entry if (i < numWallpapersActive)
m_szReply += '\n'; // dont add newline on last entry
} }
return true;
return true;
} }
m_szReply = "invalid command"; m_szReply = "invalid command";