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

Wide-glyph damage expansion, screenshot dir in settings, install command on releases

Browse Source 
- SafeBackend now tracks wide cells and explicitly overwrites the
  right half when a wide glyph is replaced by a narrow one — the case
  ratatui's diff cannot see (both buffers hold a space there) and the
  likely remaining source of ghost glyphs
- Settings dialog: new 'Skärmbilder' row edits screenshot_dir (saved
  to config.toml, applied immediately)
- Release workflow writes an install one-liner (arch-detecting curl)
  into the release body and updates it on every build
- Integration suite: 50/50

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
Bjorn Blomberg
2026-07-16 00:52:26 +02:00
parent 9d637a9378
commit 87ff0e1b77
5 changed files with 129 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/app.rs
View File

@@ -1361,7 +1361,7 @@ impl App {
self.focus_window(id);
// rad 1..=4 i innehållet motsvarar inställningsrad 0..=3
let rel = row.saturating_sub(cr.y);
if (1..=7).contains(&rel) {
if (1..=8).contains(&rel) {
let target = (rel - 1) as usize;
let mut activate = false;
if let Some(WindowContent::Settings { selected, .. }) = self.settings_content(id) {
@@ -1926,7 +1926,7 @@ impl App {
}
let ca = self.content_area;
let w = 62u16.min(ca.width.saturating_sub(2));
let h = 13u16.min(ca.height.saturating_sub(2));
let h = 17u16.min(ca.height.saturating_sub(2));
let x = ca.x as i32 + ((ca.width.saturating_sub(w)) / 2) as i32;
let y = ca.y as i32 + ((ca.height.saturating_sub(h)) / 2) as i32;
let id = self.next_id;
@@ -1955,7 +1955,7 @@ impl App {
}
fn handle_settings_key(&mut self, id: usize, key: KeyEvent) {
const ROWS: usize = 7;
const ROWS: usize = 8;
// Tangentvyn är öppen?
let keys_state = match self.settings_content(id) {
Some(WindowContent::Settings { keys, .. }) => *keys,
@@ -2068,13 +2068,27 @@ impl App {
KeyCode::Enter => {
let buf = editing.take().unwrap_or_default();
let val = buf.trim().to_string();
self.config.default_editor =
if val.is_empty() { None } else { Some(val) };
let _ = Config::save_top_level_str(
"config.toml",
"default_editor",
self.config.default_editor.as_deref(),
);
let row = match self.settings_content(id) {
Some(WindowContent::Settings { selected, .. }) => *selected,
_ => 2,
};
if row == 3 {
self.config.screenshot_dir =
if val.is_empty() { None } else { Some(val) };
let _ = Config::save_top_level_str(
"config.toml",
"screenshot_dir",
self.config.screenshot_dir.as_deref(),
);
} else {
self.config.default_editor =
if val.is_empty() { None } else { Some(val) };
let _ = Config::save_top_level_str(
"config.toml",
"default_editor",
self.config.default_editor.as_deref(),
);
}
}
KeyCode::Esc => {
*editing = None;
@@ -2135,6 +2149,7 @@ impl App {
/// direkt, men tema/flaggor appliceras även omedelbart i minnet.
fn settings_activate(&mut self, id: usize, forward: bool) {
let current_editor = self.config.default_editor.clone().unwrap_or_default();
let current_shotdir = self.config.screenshot_dir.clone().unwrap_or_default();
let Some(WindowContent::Settings { selected, editing, .. }) = self.settings_content(id) else { return };
let row = *selected;
if row == 2 {
@@ -2142,14 +2157,19 @@ impl App {
*editing = Some(current_editor);
return;
}
if row == 5 {
if row == 3 {
// Skärmbildskatalog: börja textredigera värdet
*editing = Some(current_shotdir);
return;
}
if row == 6 {
// Associationer: öppna listvyn
if let Some(WindowContent::Settings { assoc, .. }) = self.settings_content(id) {
*assoc = Some(0);
}
return;
}
if row == 6 {
if row == 7 {
// Tangenter: öppna keybind-vyn
if let Some(WindowContent::Settings { keys, .. }) = self.settings_content(id) {
*keys = Some((0, false));
@@ -2190,11 +2210,11 @@ impl App {
let _ = Config::save_panel_file("config.toml", 0, &options[next]);
// panel-innehållet läses om av hot-reloaden
}
3 => {
4 => {
self.config.shadow = !self.config.shadow;
let _ = Config::save_top_level_bool("config.toml", "shadow", self.config.shadow);
}
4 => {
5 => {
self.config.show_scrollbar = !self.config.show_scrollbar;
let _ = Config::save_top_level_bool("config.toml", "show_scrollbar", self.config.show_scrollbar);
}

35
src/backend.rs
View File

@@ -21,11 +21,20 @@ use std::io::{self, Write};
pub struct SafeBackend<W: Write> {
writer: W,
/// Positioner där vi senast skrev ett brett (2-kolumns) tecken.
/// Behövs för att expandera ratatuis diff: när ett brett tecken
/// ersätts av ett smalt innehåller diffen bara vänstercellen —
/// högercellen är "space" i båda ratatui-buffertarna och skrivs
/// aldrig om, så terminalen kan lämna kvar glyfens högra halva.
wide_cells: std::collections::HashSet<(u16, u16)>,
}
impl<W: Write> SafeBackend<W> {
pub fn new(writer: W) -> Self {
SafeBackend { writer }
SafeBackend {
writer,
wide_cells: std::collections::HashSet::new(),
}
}
}
@@ -69,11 +78,15 @@ impl<W: Write> Backend for SafeBackend<W> {
I: Iterator<Item = (u16, u16, &'a Cell)>,
{
use std::fmt::Write as _;
let cells: Vec<(u16, u16, &Cell)> = content.collect();
let in_diff: std::collections::HashSet<(u16, u16)> =
cells.iter().map(|(x, y, _)| (*x, *y)).collect();
let mut buf = String::new();
let mut last_fg = None;
let mut last_bg = None;
let mut last_mod = None;
for (x, y, cell) in content {
for (x, y, cell) in cells {
// Explicit position för varje cell — se modulkommentaren.
let _ = write!(buf, "\x1b[{};{}H", y + 1, x + 1);
if last_mod != Some(cell.modifier) {
@@ -91,6 +104,23 @@ impl<W: Write> Backend for SafeBackend<W> {
last_bg = Some(cell.bg);
}
buf.push_str(cell.symbol());
let width = unicode_width::UnicodeWidthStr::width(cell.symbol());
let was_wide = self.wide_cells.contains(&(x, y));
if width > 1 {
self.wide_cells.insert((x, y));
} else {
self.wide_cells.remove(&(x, y));
// Skade-expansion: ett brett tecken ersattes av ett smalt.
// Ratatui-diffen innehåller inte högercellen (space i båda
// buffertarna) men terminalen kan ha kvar glyfens högra
// halva där — skriv explicit över den med ett space i den
// nya cellens bakgrundsfärg.
if was_wide && !in_diff.contains(&(x + 1, y)) {
let _ = write!(buf, "\x1b[{};{}H ", y + 1, x + 2);
self.wide_cells.remove(&(x + 1, y));
}
}
}
buf.push_str("\x1b[0m");
self.writer.write_all(buf.as_bytes())
@@ -117,6 +147,7 @@ impl<W: Write> Backend for SafeBackend<W> {
}
fn clear(&mut self) -> io::Result<()> {
self.wide_cells.clear();
self.writer.write_all(b"\x1b[2J\x1b[H")
}

17
src/render.rs
View File

@@ -647,19 +647,22 @@ fn render_settings_content(
.first()
.and_then(|p| p.file.as_deref())
.unwrap_or("(inline)");
let editor_val = match editing {
Some(buf) => format!("{}▏ (Enter=spara, Esc=avbryt)", buf),
None => app
.config
.default_editor
.clone()
.unwrap_or_else(|| "(ingen — Enter för att ange)".to_string()),
let edit_val = |row: usize, current: Option<String>, hint: &str| -> String {
if selected == row {
if let Some(buf) = editing {
return format!("{}▏ (Enter=spara, Esc=avbryt)", buf);
}
}
current.unwrap_or_else(|| hint.to_string())
};
let editor_val = edit_val(2, app.config.default_editor.clone(), "(ingen — Enter för att ange)");
let shotdir_val = edit_val(3, app.config.screenshot_dir.clone(), "skärmbilder (standard)");
let onoff = |b: bool| if b { "[x] på " } else { "[ ] av " };
let rows: Vec<(String, String)> = vec![
("Tema".to_string(), format!("‹ {} ›", theme_name)),
("Panel".to_string(), format!("‹ {} ›", panel_name)),
("Editor".to_string(), editor_val),
("Skärmbilder".to_string(), shotdir_val),
("Skugga".to_string(), onoff(app.config.shadow).to_string()),
("Scrollbar".to_string(), onoff(app.config.show_scrollbar).to_string()),
(