forked from genewildish/Mainline
Gene Johnson
84cb16d463
Add msg_gradient() helper function to render.py that applies message (ntfy) gradient using the active theme's message_gradient property. This replaces hardcoded magenta gradient in scroll.py with a theme-aware approach that uses complementary colors from the active theme. - Add msg_gradient(rows, offset) helper in render.py with fallback to default magenta gradient when no theme is active - Update scroll.py imports to use msg_gradient instead of lr_gradient_opposite - Replace lr_gradient_opposite() call with msg_gradient() in message overlay rendering - Add 6 comprehensive tests for msg_gradient covering theme usage, fallback behavior, and edge cases All tests pass (121 passed), no regressions detected. Co-Authored-By: Claude Haiku 4.5 <noreply@anthropic.com>
221 lines
8.3 KiB
Python
221 lines
8.3 KiB
Python
"""
|
|
Render engine — ticker content, scroll motion, message panel, and firehose overlay.
|
|
Depends on: config, terminal, render, effects, ntfy, mic.
|
|
"""
|
|
|
|
import random
|
|
import re
|
|
import sys
|
|
import time
|
|
from datetime import datetime
|
|
|
|
from engine import config
|
|
from engine.effects import (
|
|
fade_line,
|
|
firehose_line,
|
|
glitch_bar,
|
|
next_headline,
|
|
noise,
|
|
vis_trunc,
|
|
)
|
|
from engine.render import big_wrap, lr_gradient, msg_gradient, make_block
|
|
from engine.terminal import CLR, RST, W_COOL, th, tw
|
|
|
|
|
|
def stream(items, ntfy_poller, mic_monitor):
|
|
"""Main render loop with four layers: message, ticker, scroll motion, firehose."""
|
|
random.shuffle(items)
|
|
pool = list(items)
|
|
seen = set()
|
|
queued = 0
|
|
|
|
time.sleep(0.5)
|
|
sys.stdout.write(CLR)
|
|
sys.stdout.flush()
|
|
|
|
w, h = tw(), th()
|
|
fh = config.FIREHOSE_H if config.FIREHOSE else 0
|
|
ticker_view_h = h - fh # reserve fixed firehose strip at bottom
|
|
GAP = 3 # blank rows between headlines
|
|
scroll_step_interval = config.SCROLL_DUR / (ticker_view_h + 15) * 2
|
|
|
|
# Taxonomy:
|
|
# - message: centered ntfy overlay panel
|
|
# - ticker: large headline text content
|
|
# - scroll: upward camera motion applied to ticker content
|
|
# - firehose: fixed carriage-return style strip pinned at bottom
|
|
# Active ticker blocks: (content_rows, color, canvas_y, meta_idx)
|
|
active = []
|
|
scroll_cam = 0 # viewport top in virtual canvas coords
|
|
ticker_next_y = (
|
|
ticker_view_h # canvas-y where next block starts (off-screen bottom)
|
|
)
|
|
noise_cache = {}
|
|
scroll_motion_accum = 0.0
|
|
|
|
def _noise_at(cy):
|
|
if cy not in noise_cache:
|
|
noise_cache[cy] = noise(w) if random.random() < 0.15 else None
|
|
return noise_cache[cy]
|
|
|
|
# Message color: bright cyan/white — distinct from headline greens
|
|
MSG_META = "\033[38;5;245m" # cool grey
|
|
MSG_BORDER = "\033[2;38;5;37m" # dim teal
|
|
_msg_cache = (None, None) # (cache_key, rendered_rows)
|
|
|
|
while queued < config.HEADLINE_LIMIT or active:
|
|
t0 = time.monotonic()
|
|
w, h = tw(), th()
|
|
fh = config.FIREHOSE_H if config.FIREHOSE else 0
|
|
ticker_view_h = h - fh
|
|
|
|
# ── Check for ntfy message ────────────────────────
|
|
msg_h = 0
|
|
msg_overlay = []
|
|
msg = ntfy_poller.get_active_message()
|
|
|
|
buf = []
|
|
if msg is not None:
|
|
m_title, m_body, m_ts = msg
|
|
# ── Message overlay: centered in the viewport ──
|
|
display_text = m_body or m_title or "(empty)"
|
|
display_text = re.sub(r"\s+", " ", display_text.upper())
|
|
cache_key = (display_text, w)
|
|
if _msg_cache[0] != cache_key:
|
|
msg_rows = big_wrap(display_text, w - 4)
|
|
_msg_cache = (cache_key, msg_rows)
|
|
else:
|
|
msg_rows = _msg_cache[1]
|
|
msg_rows = msg_gradient(
|
|
msg_rows, (time.monotonic() * config.GRAD_SPEED) % 1.0
|
|
)
|
|
# Layout: rendered text + meta + border
|
|
elapsed_s = int(time.monotonic() - m_ts)
|
|
remaining = max(0, config.MESSAGE_DISPLAY_SECS - elapsed_s)
|
|
ts_str = datetime.now().strftime("%H:%M:%S")
|
|
panel_h = len(msg_rows) + 2 # meta + border
|
|
panel_top = max(0, (h - panel_h) // 2)
|
|
row_idx = 0
|
|
for mr in msg_rows:
|
|
ln = vis_trunc(mr, w)
|
|
msg_overlay.append(
|
|
f"\033[{panel_top + row_idx + 1};1H {ln}{RST}\033[K"
|
|
)
|
|
row_idx += 1
|
|
# Meta line: title (if distinct) + source + countdown
|
|
meta_parts = []
|
|
if m_title and m_title != m_body:
|
|
meta_parts.append(m_title)
|
|
meta_parts.append(f"ntfy \u00b7 {ts_str} \u00b7 {remaining}s")
|
|
meta = (
|
|
" " + " \u00b7 ".join(meta_parts)
|
|
if len(meta_parts) > 1
|
|
else " " + meta_parts[0]
|
|
)
|
|
msg_overlay.append(
|
|
f"\033[{panel_top + row_idx + 1};1H{MSG_META}{meta}{RST}\033[K"
|
|
)
|
|
row_idx += 1
|
|
# Border — constant boundary under message panel
|
|
bar = "\u2500" * (w - 4)
|
|
msg_overlay.append(
|
|
f"\033[{panel_top + row_idx + 1};1H {MSG_BORDER}{bar}{RST}\033[K"
|
|
)
|
|
|
|
# Ticker draws above the fixed firehose strip; message is a centered overlay.
|
|
ticker_h = ticker_view_h - msg_h
|
|
|
|
# ── Ticker content + scroll motion (always runs) ──
|
|
scroll_motion_accum += config.FRAME_DT
|
|
while scroll_motion_accum >= scroll_step_interval:
|
|
scroll_motion_accum -= scroll_step_interval
|
|
scroll_cam += 1
|
|
|
|
# Enqueue new headlines when room at the bottom
|
|
while (
|
|
ticker_next_y < scroll_cam + ticker_view_h + 10
|
|
and queued < config.HEADLINE_LIMIT
|
|
):
|
|
t, src, ts = next_headline(pool, items, seen)
|
|
ticker_content, hc, midx = make_block(t, src, ts, w)
|
|
active.append((ticker_content, hc, ticker_next_y, midx))
|
|
ticker_next_y += len(ticker_content) + GAP
|
|
queued += 1
|
|
|
|
# Prune off-screen blocks and stale noise
|
|
active = [
|
|
(c, hc, by, mi) for c, hc, by, mi in active if by + len(c) > scroll_cam
|
|
]
|
|
for k in list(noise_cache):
|
|
if k < scroll_cam:
|
|
del noise_cache[k]
|
|
|
|
# Draw ticker zone (above fixed firehose strip)
|
|
top_zone = max(1, int(ticker_h * 0.25))
|
|
bot_zone = max(1, int(ticker_h * 0.10))
|
|
grad_offset = (time.monotonic() * config.GRAD_SPEED) % 1.0
|
|
ticker_buf_start = len(buf) # track where ticker rows start in buf
|
|
for r in range(ticker_h):
|
|
scr_row = r + 1 # 1-indexed ANSI screen row
|
|
cy = scroll_cam + r
|
|
top_f = min(1.0, r / top_zone) if top_zone > 0 else 1.0
|
|
bot_f = min(1.0, (ticker_h - 1 - r) / bot_zone) if bot_zone > 0 else 1.0
|
|
row_fade = min(top_f, bot_f)
|
|
drawn = False
|
|
for content, hc, by, midx in active:
|
|
cr = cy - by
|
|
if 0 <= cr < len(content):
|
|
raw = content[cr]
|
|
if cr != midx:
|
|
colored = lr_gradient([raw], grad_offset)[0]
|
|
else:
|
|
colored = raw
|
|
ln = vis_trunc(colored, w)
|
|
if row_fade < 1.0:
|
|
ln = fade_line(ln, row_fade)
|
|
if cr == midx:
|
|
buf.append(f"\033[{scr_row};1H{W_COOL}{ln}{RST}\033[K")
|
|
elif ln.strip():
|
|
buf.append(f"\033[{scr_row};1H{ln}{RST}\033[K")
|
|
else:
|
|
buf.append(f"\033[{scr_row};1H\033[K")
|
|
drawn = True
|
|
break
|
|
if not drawn:
|
|
n = _noise_at(cy)
|
|
if row_fade < 1.0 and n:
|
|
n = fade_line(n, row_fade)
|
|
if n:
|
|
buf.append(f"\033[{scr_row};1H{n}")
|
|
else:
|
|
buf.append(f"\033[{scr_row};1H\033[K")
|
|
|
|
# Glitch — base rate + mic-reactive spikes (ticker zone only)
|
|
mic_excess = mic_monitor.excess
|
|
glitch_prob = 0.32 + min(0.9, mic_excess * 0.16)
|
|
n_hits = 4 + int(mic_excess / 2)
|
|
ticker_buf_len = len(buf) - ticker_buf_start
|
|
if random.random() < glitch_prob and ticker_buf_len > 0:
|
|
for _ in range(min(n_hits, ticker_buf_len)):
|
|
gi = random.randint(0, ticker_buf_len - 1)
|
|
scr_row = gi + 1
|
|
buf[ticker_buf_start + gi] = f"\033[{scr_row};1H{glitch_bar(w)}"
|
|
|
|
if config.FIREHOSE and fh > 0:
|
|
for fr in range(fh):
|
|
scr_row = h - fh + fr + 1
|
|
fline = firehose_line(items, w)
|
|
buf.append(f"\033[{scr_row};1H{fline}\033[K")
|
|
if msg_overlay:
|
|
buf.extend(msg_overlay)
|
|
|
|
sys.stdout.buffer.write("".join(buf).encode())
|
|
sys.stdout.flush()
|
|
|
|
# Precise frame timing
|
|
elapsed = time.monotonic() - t0
|
|
time.sleep(max(0, config.FRAME_DT - elapsed))
|
|
|
|
sys.stdout.write(CLR)
|
|
sys.stdout.flush()
|