feat: scale the shell to the room's television
A 32" panel a few feet from the children and a 65" set across a hall want the same design at different sizes. UI_SCALE in device.conf now sets that, and nobody has to edit CSS or source to tune a room. The stylesheet and the notification config become templates carrying measurement tokens. classroom-dock resolves the stylesheet in memory at startup; classroom-notifications resolves the notification config into the session's runtime directory and execs mako on it, so the process is still just mako and everything that looks for it by name still finds it. Neither template is rewritten on disk, so an update cannot lose a room's setting and a room cannot drift from the packaged design. Dock height and the reserved strip, corner radii, padding, button size, spacing, every icon, the clock and its inset, and the notification geometry all follow the scale. Colours, translucency and the hairline borders do not: those are the design, not the size. At UI_SCALE=1.0 the rendered stylesheet is byte-identical to the one the shell used before any of this existed, which is the property worth keeping. Values outside 0.8 to 1.5 are clamped and anything that is not a number falls back to 1.0, so a typo in device.conf cannot produce an unusable classroom. Device configuration moves into a shared module, since the dock and the notification daemon now have to agree about what a setting means. Co-Authored-By: Claude Opus 5 <[email protected]>
This commit is contained in:
co-authored by
Claude Opus 5
parent
02094a6931
commit
428eb27a74
Executable
+74
@@ -0,0 +1,74 @@
|
||||
#!/usr/bin/env python3
|
||||
|
||||
"""Starts mako with the classroom styling at the room's UI scale.
|
||||
|
||||
mako only reads ~/.config, and its measurements have to follow UI_SCALE,
|
||||
so the packaged template is resolved into the session's runtime directory
|
||||
and mako is pointed at the result.
|
||||
"""
|
||||
|
||||
import os
|
||||
import sys
|
||||
from pathlib import Path
|
||||
|
||||
sys.path.insert(0, "/usr/local/lib/ekklesia-classroom")
|
||||
|
||||
from classroom_config import read_device_config, scaled, ui_scale # noqa: E402
|
||||
|
||||
MAKO = "/usr/bin/mako"
|
||||
TEMPLATE = Path("/etc/ekklesia-classroom/mako/config.in")
|
||||
|
||||
# The same measurements the template carries, at UI_SCALE=1.0.
|
||||
MEASUREMENTS = {
|
||||
"font-size": 12,
|
||||
"radius": 18,
|
||||
"padding-v": 14,
|
||||
"padding-h": 18,
|
||||
"margin": 18,
|
||||
"width": 380,
|
||||
"height": 160,
|
||||
"icon-size": 48,
|
||||
}
|
||||
|
||||
|
||||
def runtime_directory():
|
||||
base = os.environ.get("XDG_RUNTIME_DIR") or "/tmp"
|
||||
|
||||
directory = Path(base) / "ekklesia-classroom"
|
||||
directory.mkdir(parents=True, exist_ok=True)
|
||||
|
||||
return directory
|
||||
|
||||
|
||||
def render(scale):
|
||||
config = TEMPLATE.read_text()
|
||||
|
||||
for token, value in MEASUREMENTS.items():
|
||||
config = config.replace(
|
||||
f"@{token}@",
|
||||
str(scaled(value, scale)),
|
||||
)
|
||||
|
||||
return config
|
||||
|
||||
|
||||
def main():
|
||||
scale = ui_scale(read_device_config())
|
||||
|
||||
try:
|
||||
path = runtime_directory() / "mako.config"
|
||||
path.write_text(render(scale))
|
||||
config_argument = str(path)
|
||||
except OSError as error:
|
||||
# Better plain notifications than none at all.
|
||||
print(
|
||||
f"classroom-notifications: falling back to the unscaled template: {error}",
|
||||
file=sys.stderr,
|
||||
)
|
||||
config_argument = str(TEMPLATE)
|
||||
|
||||
os.execv(MAKO, [MAKO, "--config", config_argument])
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
main()
|
||||
Reference in New Issue
Block a user