Migration to sway #5

Merged
aniva merged 3 commits from sway into main 2023-09-23 14:46:11 -07:00
2 changed files with 91 additions and 51 deletions
Showing only changes of commit bd82c3f4ec - Show all commits

View File

@ -6,81 +6,121 @@ Utility to generate the workspace buttons for eww bar widget.
Currently it fetches information from monitor 0. If all monitors have
synchronised workspaces this should not be a problem.
"""
import os, sys, socket, json
import os, sys, socket, json, subprocess
from typing import Optional
WORKSPACE_ICONS = [
(1, '☱'),
(2, '☲'),
(3, '☳'),
(4, '☴'),
(5, '☵'),
(6, '☶'),
(7, '☷'),
(8, '☰'),
(1, "☱"),
(2, "☲"),
(3, "☳"),
(4, "☴"),
(5, "☵"),
(6, "☶"),
(7, "☷"),
(8, "☰"),
]
EXTRA_WORKSPACE_ICONS = [
(0, '⚌'),
(1, '⚍'),
(2, '⚎'),
(3, '⚏'),
(0, "⚌"),
(1, "⚍"),
(2, "⚎"),
(3, "⚏"),
]
def get_workspace_info():
Workspaces = dict[int, bool]
workspaces = json.loads(os.popen('hyprctl workspaces -j').read())
monitors = json.loads(os.popen('hyprctl monitors -j').read())
if not monitors:
print("No monitor found!", file=sys.stderr)
return []
monitor, active = [(m['name'], m['activeWorkspace']['id'])
for m in monitors if m['id'] == 0][0]
workspaces = [(w['id'], w['id'] == active)
for w in workspaces
if w['monitor'] == monitor]
return workspaces
def get_widgets():
# get all workspace keys
workspaces = {k: v for k, v in get_workspace_info()}
def get_widgets(workspaces: Workspaces) -> str:
"""
Create widget sexp from workspace information
"""
def get_class(k):
key = workspaces.get(k, None)
if key is None:
return 'inactive'
return "inactive"
elif key:
return 'focused'
return "focused"
else:
return 'active'
return "active"
buttons = [
f'"id": "{k}", "text": "{icon}", "class": "{get_class(k)}"'
for k, icon in WORKSPACE_ICONS
]
buttons = ', '.join(['{' + b + '}' for b in buttons])
return '[' + buttons + ']'
buttons = ", ".join(["{" + b + "}" for b in buttons])
return "[" + buttons + "]"
def listen():
# Compositor specific information
def hypr_get_workspace_info() -> Workspaces:
workspaces = json.loads(os.popen("hyprctl workspaces -j").read())
monitors = json.loads(os.popen("hyprctl monitors -j").read())
if not monitors:
print("No monitor found!", file=sys.stderr)
return []
monitor, active = [
(m["name"], m["activeWorkspace"]["id"]) for m in monitors if m["id"] == 0
][0]
workspaces = {
w["id"]: w["id"] == active
for w in workspaces if w["monitor"] == monitor
}
return workspaces
def hypr_listen(socket_addr: str):
sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
KEY = 'HYPRLAND_INSTANCE_SIGNATURE'
signature = os.environ.get(KEY, None)
if signature is None:
print("Hyprland variable uninitialised.", file=sys.stderr)
return
server_address = f"/tmp/hypr/{signature}/.socket2.sock"
try:
sock.connect(server_address)
sock.connect(socket_addr)
except:
print(f"Could not connect to {server_address}", file=sys.stderr)
print(f"Could not connect to {socket_addr}", file=sys.stderr)
raise
# The flush here is very important since python by default buffers!
print(get_widgets(), flush=True)
workspace_info = hypr_get_workspace_info()
print(get_widgets(workspace_info), flush=True)
while sock:
data = sock.recv(1024)
if b'workspace' in data:
print(get_widgets(), flush=True)
if b"workspace" in data:
workspace_info = hypr_get_workspace_info()
print(get_widgets(workspace_info), flush=True)
listen()
def sway_get_workspace_info() -> Workspaces:
workspaces = json.loads(os.popen("swaymsg --raw -t get_workspaces").read())
# REVIEW: This has not been tested on a multi-monitor setup.
workspaces = {
int(w["num"]): w["focused"]
for w in workspaces
}
return workspaces
def sway_listen():
proc = subprocess.Popen(
["swaymsg", "-t", "subscribe", "-m", '["workspace"]'], stdout=subprocess.PIPE
)
workspace_info = sway_get_workspace_info()
print(get_widgets(workspace_info), flush=True)
while line := proc.stdout.readline():
# Not needed
info = json.loads(line)
workspace_info = sway_get_workspace_info()
print(get_widgets(workspace_info), flush=True)
def detect():
"""
Main entry point, detects the type of compositor used
"""
if signature := os.environ.get("HYPRLAND_INSTANCE_SIGNATURE", None):
socket_addr = f"/tmp/hypr/{signature}/.socket2.sock"
return hypr_listen(socket_addr)
if signature := os.environ.get("SWAYSOCK", None):
return sway_listen()
print("No compositor found.", file=sys.stderr)
return None
if __name__ == "__main__":
detect()

View File

@ -1,9 +1,9 @@
exec /usr/share/swayfx/scripts/inactive-windows-transparency --opacity 0.8
exec_always eww --config ~/.config/eww/bar open bar
bar {
position top
swaybar_command waybar
}
swaybg_command multibg-sway ~/.config/sway/wallpapers
exec_always multibg-sway ~/.config/sway/wallpapers
exec swaync
exec fcitx5
exec eww --config ~/.config/eww/bar open bar