support sockets moved to $XDG_RUNTIME_DIR/hypr #290

nwg-piotr · Apr 30, 2024 · 0fd1c52 · 0fd1c52
1 parent dfc5104
commit 0fd1c52
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/nwg_panel/main.py b/nwg_panel/main.py
@@ -158,8 +158,12 @@ def restart():
 def hypr_watcher():
     import socket
 
+    # /tmp/hypr moved to $XDG_RUNTIME_DIR/hypr in #5788
+    hypr_dir = f"{os.getenv("XDG_RUNTIME_DIR")}/hypr" if os.path.isdir(
+        f"{os.getenv("XDG_RUNTIME_DIR")}/hypr") else "/tmp/hypr"
+
     client = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
-    client.connect("/tmp/hypr/{}/.socket2.sock".format(his))
+    client.connect(f"{hypr_dir}/{his}/.socket2.sock")
 
     global last_client_addr, last_client_title
     client_addr, client_title = None, None

diff --git a/nwg_panel/processes.py b/nwg_panel/processes.py
@@ -45,8 +45,12 @@ class SortOrder(Enum):
 
 
 def hyprctl(cmd):
+    # /tmp/hypr moved to $XDG_RUNTIME_DIR/hypr in #5788
+    hypr_dir = f"{os.getenv("XDG_RUNTIME_DIR")}/hypr" if os.path.isdir(
+        f"{os.getenv("XDG_RUNTIME_DIR")}/hypr") else "/tmp/hypr"
+
     s = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
-    s.connect("/tmp/hypr/{}/.socket.sock".format(os.getenv("HYPRLAND_INSTANCE_SIGNATURE")))
+    s.connect(f"{hypr_dir}/{os.getenv("HYPRLAND_INSTANCE_SIGNATURE")}/.socket.sock")
 
     s.send(cmd.encode("utf-8"))
     output = s.recv(20480).decode('utf-8')

diff --git a/nwg_panel/tools.py b/nwg_panel/tools.py
@@ -820,9 +820,13 @@ def load_shell_data():
 
 
 def hyprctl(cmd, buf_size=2048):
+    # /tmp/hypr moved to $XDG_RUNTIME_DIR/hypr in #5788
+    hypr_dir = f"{os.getenv("XDG_RUNTIME_DIR")}/hypr" if os.path.isdir(
+        f"{os.getenv("XDG_RUNTIME_DIR")}/hypr") else "/tmp/hypr"
+
     s = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
     try:
-        s.connect("/tmp/hypr/{}/.socket.sock".format(os.getenv("HYPRLAND_INSTANCE_SIGNATURE")))
+        s.connect(f"{hypr_dir}/{os.getenv("HYPRLAND_INSTANCE_SIGNATURE")}/.socket.sock")
         s.send(cmd.encode("utf-8"))
 
         output = b""