forked from genewildish/Mainline
Add mouse wheel and keyboard scrolling support to REPL
- Add scroll_offset to REPLState (max 50 lines) - Modify _render_repl() to use manual scroll position - Add scroll_output(delta) method for scroll control - Add PageUp/PageDown keyboard support (scroll 10 lines) - Add mouse wheel support via SGR mouse tracking - Update HUD to show scroll percentage (like vim) and position - Reset scroll when new output arrives - Add tests for scroll functionality
This commit is contained in:
@@ -575,8 +575,21 @@ def run_pipeline_mode_direct():
|
||||
repl_effect.navigate_history(-1)
|
||||
elif key == "down":
|
||||
repl_effect.navigate_history(1)
|
||||
elif key == "page_up":
|
||||
repl_effect.scroll_output(-10) # Scroll up 10 lines
|
||||
elif key == "page_down":
|
||||
repl_effect.scroll_output(10) # Scroll down 10 lines
|
||||
elif key == "backspace":
|
||||
repl_effect.backspace()
|
||||
elif key.startswith("mouse:"):
|
||||
# Mouse event format: mouse:button:x:y
|
||||
parts = key.split(":")
|
||||
if len(parts) >= 2:
|
||||
button = int(parts[1])
|
||||
if button == 64: # Wheel up
|
||||
repl_effect.scroll_output(-3) # Scroll up 3 lines
|
||||
elif button == 65: # Wheel down
|
||||
repl_effect.scroll_output(3) # Scroll down 3 lines
|
||||
elif len(key) == 1:
|
||||
repl_effect.append_to_command(key)
|
||||
# --- End REPL Input Handling ---
|
||||
|
||||
@@ -1016,8 +1016,21 @@ def run_pipeline_mode(preset_name: str = "demo", graph_config: str | None = None
|
||||
repl_effect.navigate_history(-1)
|
||||
elif key == "down":
|
||||
repl_effect.navigate_history(1)
|
||||
elif key == "page_up":
|
||||
repl_effect.scroll_output(-10) # Scroll up 10 lines
|
||||
elif key == "page_down":
|
||||
repl_effect.scroll_output(10) # Scroll down 10 lines
|
||||
elif key == "backspace":
|
||||
repl_effect.backspace()
|
||||
elif key.startswith("mouse:"):
|
||||
# Mouse event format: mouse:button:x:y
|
||||
parts = key.split(":")
|
||||
if len(parts) >= 2:
|
||||
button = int(parts[1])
|
||||
if button == 64: # Wheel up
|
||||
repl_effect.scroll_output(-3) # Scroll up 3 lines
|
||||
elif button == 65: # Wheel down
|
||||
repl_effect.scroll_output(3) # Scroll down 3 lines
|
||||
elif len(key) == 1:
|
||||
repl_effect.append_to_command(key)
|
||||
# --- End REPL Input Handling ---
|
||||
|
||||
@@ -157,6 +157,9 @@ class TerminalDisplay:
|
||||
def cleanup(self) -> None:
|
||||
from engine.terminal import CURSOR_ON
|
||||
|
||||
# Disable mouse tracking if enabled
|
||||
self.disable_mouse_tracking()
|
||||
|
||||
# Restore normal terminal mode if raw mode was enabled
|
||||
self.set_raw_mode(False)
|
||||
|
||||
@@ -174,6 +177,24 @@ class TerminalDisplay:
|
||||
"""Request quit (e.g., when Ctrl+C is pressed)."""
|
||||
self._quit_requested = True
|
||||
|
||||
def enable_mouse_tracking(self) -> None:
|
||||
"""Enable SGR mouse tracking mode."""
|
||||
try:
|
||||
# SGR mouse mode: \x1b[?1006h
|
||||
sys.stdout.write("\x1b[?1006h")
|
||||
sys.stdout.flush()
|
||||
except (OSError, AttributeError):
|
||||
pass # Terminal might not support mouse tracking
|
||||
|
||||
def disable_mouse_tracking(self) -> None:
|
||||
"""Disable SGR mouse tracking mode."""
|
||||
try:
|
||||
# Disable SGR mouse mode: \x1b[?1006l
|
||||
sys.stdout.write("\x1b[?1006l")
|
||||
sys.stdout.flush()
|
||||
except (OSError, AttributeError):
|
||||
pass
|
||||
|
||||
def set_raw_mode(self, enable: bool = True) -> None:
|
||||
"""Enable/disable raw terminal mode for input capture.
|
||||
|
||||
@@ -192,7 +213,11 @@ class TerminalDisplay:
|
||||
# Set raw mode
|
||||
tty.setraw(sys.stdin.fileno())
|
||||
self._raw_mode_enabled = True
|
||||
# Enable mouse tracking
|
||||
self.enable_mouse_tracking()
|
||||
elif not enable and self._raw_mode_enabled:
|
||||
# Disable mouse tracking
|
||||
self.disable_mouse_tracking()
|
||||
# Restore original terminal settings
|
||||
if self._original_termios:
|
||||
termios.tcsetattr(
|
||||
@@ -223,16 +248,35 @@ class TerminalDisplay:
|
||||
char = sys.stdin.read(1)
|
||||
|
||||
if char == "\x1b": # Escape sequence
|
||||
# Read next character to determine key
|
||||
seq = sys.stdin.read(2)
|
||||
if seq == "[A":
|
||||
keys.append("up")
|
||||
elif seq == "[B":
|
||||
keys.append("down")
|
||||
elif seq == "[C":
|
||||
keys.append("right")
|
||||
elif seq == "[D":
|
||||
keys.append("left")
|
||||
# Read next characters to determine key
|
||||
# Try to read up to 10 chars for longer sequences
|
||||
seq = sys.stdin.read(10)
|
||||
|
||||
# PageUp: \x1b[5~
|
||||
if seq.startswith("[5~"):
|
||||
keys.append("page_up")
|
||||
# PageDown: \x1b[6~
|
||||
elif seq.startswith("[6~"):
|
||||
keys.append("page_down")
|
||||
# Arrow keys: \x1b[A, \x1b[B, etc.
|
||||
elif seq.startswith("["):
|
||||
if seq[1] == "A":
|
||||
keys.append("up")
|
||||
elif seq[1] == "B":
|
||||
keys.append("down")
|
||||
elif seq[1] == "C":
|
||||
keys.append("right")
|
||||
elif seq[1] == "D":
|
||||
keys.append("left")
|
||||
else:
|
||||
# Unknown escape sequence
|
||||
keys.append("escape")
|
||||
# Mouse events: \x1b[<B;X;Ym or \x1b[<B;X;YM
|
||||
elif seq.startswith("[<"):
|
||||
mouse_seq = "\x1b" + seq
|
||||
mouse_data = self._parse_mouse_event(mouse_seq)
|
||||
if mouse_data:
|
||||
keys.append(mouse_data)
|
||||
else:
|
||||
# Unknown escape sequence
|
||||
keys.append("escape")
|
||||
@@ -248,8 +292,6 @@ class TerminalDisplay:
|
||||
keys.append("ctrl_c")
|
||||
elif char == "\x04": # Ctrl+D
|
||||
keys.append("ctrl_d")
|
||||
elif char == "\x1b": # Escape
|
||||
keys.append("escape")
|
||||
elif char.isprintable():
|
||||
keys.append(char)
|
||||
except OSError:
|
||||
@@ -257,6 +299,40 @@ class TerminalDisplay:
|
||||
|
||||
return keys
|
||||
|
||||
def _parse_mouse_event(self, data: str) -> str | None:
|
||||
"""Parse SGR mouse event sequence.
|
||||
|
||||
Format: \x1b[<B;X;Ym (release) or \x1b[<B;X;YM (press)
|
||||
B = button number (0=left, 1=middle, 2=right, 64=wheel up, 65=wheel down)
|
||||
X, Y = coordinates (1-indexed)
|
||||
|
||||
Returns:
|
||||
Mouse event string like "mouse:64:10:5" or None if not a mouse event
|
||||
"""
|
||||
if not data.startswith("\x1b[<"):
|
||||
return None
|
||||
|
||||
# Find the ending 'm' or 'M'
|
||||
end_pos = data.rfind("m")
|
||||
if end_pos == -1:
|
||||
end_pos = data.rfind("M")
|
||||
if end_pos == -1:
|
||||
return None
|
||||
|
||||
inner = data[3:end_pos] # Remove \x1b[< and trailing m/M
|
||||
parts = inner.split(";")
|
||||
|
||||
if len(parts) >= 3:
|
||||
try:
|
||||
button = int(parts[0])
|
||||
x = int(parts[1]) - 1 # Convert to 0-indexed
|
||||
y = int(parts[2]) - 1
|
||||
return f"mouse:{button}:{x}:{y}"
|
||||
except ValueError:
|
||||
pass
|
||||
|
||||
return None
|
||||
|
||||
def is_raw_mode_enabled(self) -> bool:
|
||||
"""Check if raw mode is currently enabled."""
|
||||
return self._raw_mode_enabled
|
||||
|
||||
@@ -47,8 +47,9 @@ class REPLState:
|
||||
current_command: str = ""
|
||||
history_index: int = -1
|
||||
output_buffer: list[str] = field(default_factory=list)
|
||||
scroll_offset: int = 0 # Manual scroll position (0 = bottom of buffer)
|
||||
max_history: int = 50
|
||||
max_output_lines: int = 20
|
||||
max_output_lines: int = 50 # 50 lines excluding empty lines
|
||||
|
||||
|
||||
class ReplEffect(EffectPlugin):
|
||||
@@ -137,10 +138,23 @@ class ReplEffect(EffectPlugin):
|
||||
# Line 1: Title + FPS + Frame time
|
||||
fps_str = f"FPS: {fps:.1f}" if fps > 0 else "FPS: --"
|
||||
time_str = f"{frame_time:.1f}ms" if frame_time > 0 else "--ms"
|
||||
|
||||
# Calculate scroll percentage (like vim)
|
||||
scroll_pct = 0
|
||||
if len(self.state.output_buffer) > 1:
|
||||
max_scroll = len(self.state.output_buffer) - 1
|
||||
scroll_pct = (
|
||||
int((self.state.scroll_offset / max_scroll) * 100)
|
||||
if max_scroll > 0
|
||||
else 0
|
||||
)
|
||||
|
||||
scroll_str = f"{scroll_pct}%"
|
||||
line1 = (
|
||||
f"\033[38;5;46mMAINLINE REPL\033[0m "
|
||||
f"\033[38;5;245m|\033[0m \033[38;5;39m{fps_str}\033[0m "
|
||||
f"\033[38;5;245m|\033[0m \033[38;5;208m{time_str}\033[0m"
|
||||
f"\033[38;5;245m|\033[0m \033[38;5;208m{time_str}\033[0m "
|
||||
f"\033[38;5;245m|\033[0m \033[38;5;220m{scroll_str}\033[0m"
|
||||
)
|
||||
lines.append(line1[:width])
|
||||
|
||||
@@ -156,9 +170,14 @@ class ReplEffect(EffectPlugin):
|
||||
)
|
||||
lines.append(line2[:width])
|
||||
|
||||
# Line 3: Output buffer count
|
||||
# Line 3: Output buffer count with scroll indicator
|
||||
out_count = len(self.state.output_buffer)
|
||||
line3 = f"\033[38;5;44mOUTPUT:\033[0m \033[1;38;5;227m{out_count}\033[0m lines"
|
||||
scroll_pos = f"({self.state.scroll_offset}/{out_count})"
|
||||
line3 = (
|
||||
f"\033[38;5;44mOUTPUT:\033[0m "
|
||||
f"\033[1;38;5;227m{out_count}\033[0m lines "
|
||||
f"\033[38;5;245m{scroll_pos}\033[0m"
|
||||
)
|
||||
lines.append(line3[:width])
|
||||
|
||||
return lines
|
||||
@@ -170,12 +189,16 @@ class ReplEffect(EffectPlugin):
|
||||
# Calculate how many output lines to show
|
||||
# Reserve 1 line for input prompt
|
||||
output_height = height - 1
|
||||
output_start = max(0, len(self.state.output_buffer) - output_height)
|
||||
|
||||
# Manual scroll: scroll_offset=0 means show bottom of buffer
|
||||
# scroll_offset increases as you scroll up through history
|
||||
buffer_len = len(self.state.output_buffer)
|
||||
output_start = max(0, buffer_len - output_height - self.state.scroll_offset)
|
||||
|
||||
# Render output buffer
|
||||
for i in range(output_height):
|
||||
idx = output_start + i
|
||||
if idx < len(self.state.output_buffer):
|
||||
if idx < buffer_len:
|
||||
line = self.state.output_buffer[idx][:width]
|
||||
lines.append(line)
|
||||
else:
|
||||
@@ -191,6 +214,25 @@ class ReplEffect(EffectPlugin):
|
||||
|
||||
return lines
|
||||
|
||||
def scroll_output(self, delta: int) -> None:
|
||||
"""Scroll the output buffer by delta lines.
|
||||
|
||||
Args:
|
||||
delta: Positive to scroll up (back in time), negative to scroll down
|
||||
"""
|
||||
if not self.state.output_buffer:
|
||||
return
|
||||
|
||||
# Calculate max scroll (can't scroll past top of buffer)
|
||||
max_scroll = max(0, len(self.state.output_buffer) - 1)
|
||||
|
||||
# Update scroll offset
|
||||
self.state.scroll_offset = max(
|
||||
0, min(max_scroll, self.state.scroll_offset + delta)
|
||||
)
|
||||
|
||||
# Reset scroll when new output arrives (handled in process_command)
|
||||
|
||||
def _get_metrics(self, ctx: EffectContext) -> dict:
|
||||
"""Get pipeline metrics from context."""
|
||||
metrics = ctx.get_state("metrics")
|
||||
@@ -230,6 +272,9 @@ class ReplEffect(EffectPlugin):
|
||||
# Add to output buffer
|
||||
self.state.output_buffer.append(f"> {cmd}")
|
||||
|
||||
# Reset scroll offset when new output arrives (scroll to bottom)
|
||||
self.state.scroll_offset = 0
|
||||
|
||||
# Parse command
|
||||
parts = cmd.split()
|
||||
cmd_name = parts[0].lower()
|
||||
@@ -322,13 +367,17 @@ class ReplEffect(EffectPlugin):
|
||||
self.state.output_buffer.append("No context available")
|
||||
|
||||
def _cmd_available(self, ctx: EffectContext | None):
|
||||
"""List all available effect types."""
|
||||
"""List all available effect types and stage categories."""
|
||||
try:
|
||||
from engine.effects import get_registry
|
||||
from engine.effects.plugins import discover_plugins
|
||||
from engine.pipeline.registry import StageRegistry, discover_stages
|
||||
|
||||
# Discover plugins if not already done
|
||||
# Discover plugins and stages if not already done
|
||||
discover_plugins()
|
||||
discover_stages()
|
||||
|
||||
# List effect types from registry
|
||||
registry = get_registry()
|
||||
all_effects = registry.list_all()
|
||||
|
||||
@@ -338,8 +387,20 @@ class ReplEffect(EffectPlugin):
|
||||
self.state.output_buffer.append(f" - {name}")
|
||||
else:
|
||||
self.state.output_buffer.append("No effects registered")
|
||||
|
||||
# List stage categories and their types
|
||||
categories = StageRegistry.list_categories()
|
||||
if categories:
|
||||
self.state.output_buffer.append("")
|
||||
self.state.output_buffer.append("Stage categories:")
|
||||
for category in sorted(categories):
|
||||
stages = StageRegistry.list(category)
|
||||
if stages:
|
||||
self.state.output_buffer.append(f" {category}:")
|
||||
for stage_name in sorted(stages):
|
||||
self.state.output_buffer.append(f" - {stage_name}")
|
||||
except Exception as e:
|
||||
self.state.output_buffer.append(f"Error listing effects: {e}")
|
||||
self.state.output_buffer.append(f"Error listing available types: {e}")
|
||||
|
||||
def _cmd_effect(self, args: list[str], ctx: EffectContext | None):
|
||||
"""Toggle effect on/off."""
|
||||
|
||||
Reference in New Issue
Block a user