brasse/TUI-WM
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Fix SGR mouse release button + reflow wrapped lines on resize

Browse Source 
- SGR (1006) release events now carry the same button number as the
  press ('m' suffix marks release); the legacy 'button 3 = release'
  is only used for X10/UTF8 encodings. ncurses apps (htop etc.) could
  not pair press+release before, so clicks were ignored while scroll
  (press-only wheel events) worked
- Each window keeps its recent raw PTY output (capped at 512 KB); on
  resize the history is replayed into a fresh parser at the new width
  so long lines re-wrap correctly instead of keeping old break points
- Integration: release-button and reflow checks, 33/33 passing

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
Bjorn Blomberg
2026-07-15 20:09:45 +02:00
parent c9a4a8fc21
commit 35eb33b9a1
2 changed files with 64 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/app.rs
View File

@@ -188,8 +188,15 @@ pub struct FloatingWindow {
pub scrollback_total: usize,
/// Geometri före snap/maximering — används för återställning.
pub prev_geom: Option<(i32, i32, u16, u16)>,
/// Rå PTY-utdata (kapad till de senaste ~512 KB). Spelas upp i en
/// ny parser vid resize så att långa rader radbryts om ("reflow")
/// för den nya bredden — vt100:s set_size behåller gamla brytningar.
pty_log: Vec<u8>,
}
/// Största mängden rå PTY-historik som sparas per fönster (för reflow).
const PTY_LOG_CAP: usize = 512 * 1024;
/// Copy-mode: tangentbordsstyrd bläddring och sökning i scrollback.
pub struct CopyMode {
/// Fönstret som copy-mode gäller
@@ -671,6 +678,12 @@ impl App {
&mut window.kitty_gfx_carry,
);
window.pending_graphics.extend(gfx);
// Spara rå-datat för reflow vid resize
window.pty_log.extend_from_slice(&data);
if window.pty_log.len() > PTY_LOG_CAP {
let excess = window.pty_log.len() - PTY_LOG_CAP;
window.pty_log.drain(..excess);
}
}
Err(mpsc::TryRecvError::Empty) => break,
Err(mpsc::TryRecvError::Disconnected) => {
@@ -702,9 +715,12 @@ impl App {
if cur_rows != new_rows || cur_cols != new_cols {
crate::log::log(&format!("PTY resize: {}x{} -> {}x{} (mouse mode was {:?})", cur_cols, cur_rows, new_cols, new_rows, window.mouse_mode));
let _ = pty.resize(new_rows, new_cols);
// set_size behåller skärminnehåll och scrollback-historik —
// att återskapa parsern här raderade allt vid varje resize.
parser.screen_mut().set_size(new_rows, new_cols);
// Reflow: spela upp den sparade PTY-historiken i en ny
// parser med den nya bredden, så att radbrytningar räknas
// om (set_size behåller de gamla brytpunkterna).
let mut fresh = vt100::Parser::new(new_rows, new_cols, self.config.scrollback_lines);
fresh.process(&window.pty_log);
*parser = fresh;
}
}
@@ -1508,6 +1524,7 @@ impl App {
pending_graphics: Vec::new(),
scrollback_total: 0,
prev_geom: None,
pty_log: Vec::new(),
});
self.focus_window(id);
}
@@ -1550,6 +1567,7 @@ impl App {
pending_graphics: Vec::new(),
scrollback_total: 0,
prev_geom: None,
pty_log: Vec::new(),
});
self.focus_window(id);
}
@@ -1694,6 +1712,7 @@ impl App {
pending_graphics: Vec::new(),
scrollback_total: 0,
prev_geom: None,
pty_log: Vec::new(),
});
self.focus_window(id);
}
@@ -1734,6 +1753,7 @@ impl App {
pending_graphics: Vec::new(),
scrollback_total: 0,
prev_geom: None,
pty_log: Vec::new(),
});
self.focus_window(id);
}
@@ -2076,11 +2096,17 @@ fn encode_mouse_event(
let term_col = col.saturating_sub(content_rect.x) + 1;
let term_row = row.saturating_sub(content_rect.y) + 1;
// OBS: i SGR-kodningen (1006) ska släpp-eventet bära SAMMA knappnummer
// som trycket (suffix 'm' markerar släpp). Det legacy-baserade "knapp 3
// = släpp" gäller bara X10/UTF8-kodningarna — annars kan ncurses-appar
// (htop m.fl.) inte para ihop tryck+släpp och inget klick registreras.
let (button, is_release): (u8, bool) = match kind {
MouseEventKind::Down(MouseButton::Left) => (0, false),
MouseEventKind::Down(MouseButton::Middle) => (1, false),
MouseEventKind::Down(MouseButton::Right) => (2, false),
MouseEventKind::Up(_) => (3, true),
MouseEventKind::Up(MouseButton::Left) => (0, true),
MouseEventKind::Up(MouseButton::Middle) => (1, true),
MouseEventKind::Up(MouseButton::Right) => (2, true),
MouseEventKind::Drag(MouseButton::Left) => (32, false),
MouseEventKind::Drag(MouseButton::Middle) => (33, false),
MouseEventKind::Drag(MouseButton::Right) => (34, false),
@@ -2123,14 +2149,17 @@ fn encode_mouse_event(
Some(match encoding {
vt100::MouseProtocolEncoding::Default => {
if term_col > 223 || term_row > 223 { return None; }
vec![0x1b, b'[', b'M', button + 32, term_col as u8 + 32, term_row as u8 + 32]
// Legacy-protokollet kan inte ange vilken knapp som släpptes
let b = if is_release { 3 } else { button };
vec![0x1b, b'[', b'M', b + 32, term_col as u8 + 32, term_row as u8 + 32]
}
vt100::MouseProtocolEncoding::Sgr => {
let suffix = if is_release { 'm' } else { 'M' };
format!("\x1b[<{};{};{}{}", button, term_col, term_row, suffix).into_bytes()
}
vt100::MouseProtocolEncoding::Utf8 => {
let mut bytes = vec![0x1b, b'[', b'M', button + 32];
let b = if is_release { 3 } else { button };
let mut bytes = vec![0x1b, b'[', b'M', b + 32];
for coord in [term_col, term_row] {
let code_point = coord as u32 + 32;
if let Some(c) = char::from_u32(code_point) {