cadrgtsecond/mosham - Change 5S34ANJMEKYNSGROMFRDP22UA2FK2ENSGOBB4MPSHS7PG2BW6DLAC

feat: Render status line

Created by cadrgtsecond on December 24, 2025

5S34ANJMEKYNSGROMFRDP22UA2FK2ENSGOBB4MPSHS7PG2BW6DLAC

Dependencies

In channels

main

Change contents

Insertion in src/render.rs at line 33 [3.34]
[3.821]
[3.821]
```
    font_size: f32,
```
Insertion in src/render.rs at line 68 [3.34]
[3.2056]
[3.2056]
```
            font_size: 16.0,
```
Replacement in src/render.rs at line 72 [3.34]
B:BD[3.2074] → [3.2074:2109]
```
    fn line_height(&self) -> u32 {
```
[3.2074]
[3.2109]
```
    pub fn line_height(&self) -> u32 {
```

Replacement in src/render.rs at line 75 [3.34]

B:BD[3.2148] → [3.2148:2270]

            .and_then(|fd| Some(fd.fd_face.vertical_line_metrics(32.0)?.new_line_size as u32))
            .unwrap_or(40)

[3.2148]

[3.2270]

            .and_then(|fd| {
                Some(
                    fd.fd_face
                        .vertical_line_metrics(self.font_size)?
                        .new_line_size as u32,
                )
            })
            .unwrap_or((self.font_size * 1.5) as u32)

Replacement in src/render.rs at line 89 [3.34]

B:BD[3.2491] → [3.2491:2548]

                .rasterize_indexed_subpixel(glyph, 32.0)

[3.2491]

[3.2548]

                .rasterize_indexed_subpixel(glyph, self.font_size)

Insertion in src/render.rs at line 130 [3.34]
[3.3781]
[3.3781]
```
    let font_size = fs.font_size as i32;
```

Replacement in src/render.rs at line 134 [3.34]

B:BD[3.3900] → [3.3900:4052]

        let x_off = gpos[i].x_offset * 32 / upe + metrics.xmin;
        let y_off = gpos[i].y_offset * 32 / upe - metrics.ymin - metrics.height as i32;

[3.3900]

[3.4052]

        let x_off = gpos[i].x_offset * font_size / upe + metrics.xmin;
        let y_off = gpos[i].y_offset * font_size / upe - metrics.ymin - metrics.height as i32;

Replacement in src/render.rs at line 155 [3.34]

B:BD[3.4786] → [3.4786:4962]

                let fg = &face.fg.to_rgba(default_face.fg.to_rgba((255, 255, 255, 0)));
                let bg = &face.bg.to_rgba(default_face.bg.to_rgba((255, 255, 255, 0)));

[3.4786]

[2.0]

                let fg = &face
                    .fg
                    .to_rgba(default_face.fg.to_rgba((255, 255, 255, 255)));
                let bg = &face.bg.to_rgba(default_face.bg.to_rgba((0, 0, 0, 255)));

Replacement in src/render.rs at line 167 [3.34]

B:BD[3.5214] → [3.5214:5308]

        pos.0 += gpos[i].x_advance * 32 / upe;
        pos.1 += gpos[i].y_advance * 32 / upe;

[3.5214]

[3.5308]

        pos.0 += gpos[i].x_advance * font_size / upe;
        pos.1 += gpos[i].y_advance * font_size / upe;

Insertion in src/render.rs at line 171 [3.34]

[3.5339]

}
pub fn render_line(
    rs: &mut RenderState,
    fs: &mut FontState,
    line: &[json_ui::Atom],
    default_face: &json_ui::Face,
    pos: &mut (i32, i32),
) -> Result<(), Box<dyn Error>> {
    let mut ubuf = UnicodeBuffer::new();
    let mut curr_face = None;
    let mut curr_font = 0;
    for atom in line {
        let face = &atom.face;
        for c in atom.contents.chars() {
            let font = fs
                .faces
                .iter()
                .position(|i| i.rb_face.glyph_index(c).is_some())
                .unwrap_or(0);
            if curr_face != Some(face) || curr_font != font || c == '\n' {
                ubuf = render_segment(
                    rs,
                    fs,
                    curr_font,
                    curr_face.unwrap_or(face),
                    default_face,
                    ubuf,
                    pos,
                );
                curr_face = Some(face);
                curr_font = font;
                ubuf.clear();
            }
            if c == '\n' {
                continue;
            }
            ubuf.add(c, 2);
        }
    }
    Ok(())

Insertion in src/render.rs at line 218 [3.34]
[3.5436]
[3.5436]
```
    status_line: &[json_ui::Atom],
```

Deletion in src/render.rs at line 229 [3.34]

B:BD[3.5706] → [3.5706:5804]

    let mut ubuf = UnicodeBuffer::new();
    let mut curr_face = None;
    let mut curr_font = 0;

Replacement in src/render.rs at line 231 [3.34]

B:BD[3.5876] → [3.5876:6831]

        for atom in line {
            let face = &atom.face;
            for c in atom.contents.chars() {
                let font = fs
                    .faces
                    .iter()
                    .position(|i| i.rb_face.glyph_index(c).is_some())
                    .unwrap_or(0);
                if curr_face != Some(face) || curr_font != font || c == '\n' {
                    ubuf = render_segment(
                        rs,
                        fs,
                        curr_font,
                        curr_face.unwrap_or(face),
                        default_face,
                        ubuf,
                        &mut pos,
                    );
                    curr_face = Some(face);
                    curr_font = font;
                    ubuf.clear();
                }
                if c == '\n' {
                    continue;
                }
                ubuf.add(c, 2);
            }
        }

[3.5876]

[3.6831]

        render_line(rs, fs, line, default_face, &mut pos)?;

Insertion in src/render.rs at line 235 [3.34]

[3.6898]

    pos.1 = rs.size.1 as i32 - fs.line_height() as i32;
    render_line(rs, fs, status_line, default_face, &mut pos)?;

Deletion in src/main.rs at line 1 [4.49]
B:BD[4.49] → [3.6945:6968]
```
use std::error::Error;
```
Insertion in src/main.rs at line 2 [4.49]
[2.382]
[5.36]
```
use std::error::Error;
```
Insertion in src/main.rs at line 34 [4.49]
[6.194]
[7.1496]
Insertion in src/main.rs at line 36 [4.49]
[7.1527]
[8.1883]
```
    status_line: json_ui::Line,
```
Insertion in src/main.rs at line 47 [4.49]
[7.1738]
[8.1917]
```
            status_line: Vec::new(),
```

Replacement in src/main.rs at line 58 [4.49]

B:BD[9.185] → [9.185:253]

fn add_modifiers(key_name: &str, state: ModifiersState) -> String {

[9.185]

[9.253]

fn add_modifiers(key_name: &str, state: ModifiersState, use_shift: bool) -> String {

Replacement in src/main.rs at line 64 [4.49]
B:BD[9.368] → [9.368:395]
```
    if state.shift_key() {
```
[9.368]
[9.395]
```
    if use_shift && state.shift_key() {
```

Replacement in src/main.rs at line 77 [4.49]

B:BD[9.629] → [9.629:1085]

        Key::Named(NamedKey::Space) => Some(add_modifiers("space", state)),
        Key::Named(NamedKey::Enter) => Some(add_modifiers("ret", state)),
        Key::Named(NamedKey::Tab) => Some(add_modifiers("tab", state)),
        Key::Named(NamedKey::Backspace) => Some(add_modifiers("backspace", state)),
        Key::Named(NamedKey::Delete) => Some(add_modifiers("del", state)),
        Key::Named(NamedKey::Escape) => Some(add_modifiers("esc", state)),

[9.629]

[9.1085]

        Key::Named(NamedKey::Space) => Some(add_modifiers("space", state, true)),
        Key::Named(NamedKey::Enter) => Some(add_modifiers("ret", state, true)),
        Key::Named(NamedKey::Tab) => Some(add_modifiers("tab", state, true)),
        Key::Named(NamedKey::Backspace) => Some(add_modifiers("backspace", state, true)),
        Key::Named(NamedKey::Delete) => Some(add_modifiers("del", state, true)),
        Key::Named(NamedKey::Escape) => Some(add_modifiers("esc", state, true)),

Replacement in src/main.rs at line 84 [4.49]

B:BD[9.1086] → [9.1086:1400]

        Key::Named(NamedKey::ArrowUp) => Some(add_modifiers("up", state)),
        Key::Named(NamedKey::ArrowDown) => Some(add_modifiers("down", state)),
        Key::Named(NamedKey::ArrowLeft) => Some(add_modifiers("left", state)),
        Key::Named(NamedKey::ArrowRight) => Some(add_modifiers("right", state)),

[9.1086]

[10.550]

        Key::Named(NamedKey::ArrowUp) => Some(add_modifiers("up", state, true)),
        Key::Named(NamedKey::ArrowDown) => Some(add_modifiers("down", state, true)),
        Key::Named(NamedKey::ArrowLeft) => Some(add_modifiers("left", state, true)),
        Key::Named(NamedKey::ArrowRight) => Some(add_modifiers("right", state, true)),

Replacement in src/main.rs at line 89 [4.49]

B:BD[10.551] → [9.1401:1782]

        Key::Named(NamedKey::PageUp) => Some(add_modifiers("pageup", state)),
        Key::Named(NamedKey::PageDown) => Some(add_modifiers("pagedown", state)),
        Key::Named(NamedKey::Home) => Some(add_modifiers("home", state)),
        Key::Named(NamedKey::End) => Some(add_modifiers("end", state)),
        Key::Named(NamedKey::Insert) => Some(add_modifiers("ins", state)),

[10.551]

[9.1782]

        Key::Named(NamedKey::PageUp) => Some(add_modifiers("pageup", state, true)),
        Key::Named(NamedKey::PageDown) => Some(add_modifiers("pagedown", state, true)),
        Key::Named(NamedKey::Home) => Some(add_modifiers("home", state, true)),
        Key::Named(NamedKey::End) => Some(add_modifiers("end", state, true)),
        Key::Named(NamedKey::Insert) => Some(add_modifiers("ins", state, true)),

Replacement in src/main.rs at line 95 [4.49]

B:BD[9.1783] → [9.1783:2629]

        Key::Named(NamedKey::F1) => Some(add_modifiers("F1", state)),
        Key::Named(NamedKey::F2) => Some(add_modifiers("F2", state)),
        Key::Named(NamedKey::F3) => Some(add_modifiers("F3", state)),
        Key::Named(NamedKey::F4) => Some(add_modifiers("F4", state)),
        Key::Named(NamedKey::F5) => Some(add_modifiers("F5", state)),
        Key::Named(NamedKey::F6) => Some(add_modifiers("F6", state)),
        Key::Named(NamedKey::F7) => Some(add_modifiers("F7", state)),
        Key::Named(NamedKey::F8) => Some(add_modifiers("F8", state)),
        Key::Named(NamedKey::F9) => Some(add_modifiers("F9", state)),
        Key::Named(NamedKey::F10) => Some(add_modifiers("F10", state)),
        Key::Named(NamedKey::F11) => Some(add_modifiers("F11", state)),
        Key::Named(NamedKey::F12) => Some(add_modifiers("F12", state)),

[9.1783]

[9.2629]

        Key::Named(NamedKey::F1) => Some(add_modifiers("F1", state, true)),
        Key::Named(NamedKey::F2) => Some(add_modifiers("F2", state, true)),
        Key::Named(NamedKey::F3) => Some(add_modifiers("F3", state, true)),
        Key::Named(NamedKey::F4) => Some(add_modifiers("F4", state, true)),
        Key::Named(NamedKey::F5) => Some(add_modifiers("F5", state, true)),
        Key::Named(NamedKey::F6) => Some(add_modifiers("F6", state, true)),
        Key::Named(NamedKey::F7) => Some(add_modifiers("F7", state, true)),
        Key::Named(NamedKey::F8) => Some(add_modifiers("F8", state, true)),
        Key::Named(NamedKey::F9) => Some(add_modifiers("F9", state, true)),
        Key::Named(NamedKey::F10) => Some(add_modifiers("F10", state, true)),
        Key::Named(NamedKey::F11) => Some(add_modifiers("F11", state, true)),
        Key::Named(NamedKey::F12) => Some(add_modifiers("F12", state, true)),

Replacement in src/main.rs at line 108 [4.49]

B:BD[9.2630] → [9.2630:3134]

        Key::Character(c) if c == "+" => Some(add_modifiers("plus", state)),
        Key::Character(c) if c == "-" => Some(add_modifiers("minus", state)),
        Key::Character(c) if c == "<" => Some(add_modifiers("lt", state)),
        Key::Character(c) if c == ">" => Some(add_modifiers("lt", state)),
        Key::Character(c) if state == ModifiersState::empty() || state == ModifiersState::SHIFT => {
            Some(c.into())
        }
        Key::Character(c) => Some(add_modifiers(&c, state)),

[9.2630]

[9.3134]

        Key::Character(c) if c == "+" => Some(add_modifiers("plus", state, false)),
        Key::Character(c) if c == "-" => Some(add_modifiers("minus", state, false)),
        Key::Character(c) if c == "<" => Some(add_modifiers("lt", state, false)),
        Key::Character(c) if c == ">" => Some(add_modifiers("gt", state, false)),
        Key::Character(c) => Some(add_modifiers(&c, state, false)),

Replacement in src/main.rs at line 131 [4.49]

B:BD[5.1474] → [8.5576:5672]

                    redraw(rs, &mut self.font_state, &self.lines, &self.default_face).unwrap();

[5.1474]

[4.1018]

                    redraw(
                        rs,
                        &mut self.font_state,
                        &self.lines,
                        &self.status_line,
                        &self.default_face,
                    )
                    .unwrap();

Deletion in src/main.rs at line 149 [4.49]

B:BD[8.5716] → [8.5716:5899]

                    let lines = (size.height as f32 / 40.0) as u32;
                    let cols = 512;
                    self.kakoune.send_response(Response::Resize(lines, cols));

Insertion in src/main.rs at line 150 [4.49]

[10.948]

                let lines = (size.height / self.font_state.line_height() as u32) - 1;
                let cols = 512;
                self.kakoune.send_response(Response::Resize(lines, cols));

Replacement in src/main.rs at line 170 [4.49]

B:BD[7.3645] → [8.5900:5988]

∅:D[6.480] → [7.3716:3752]

∅:D[8.5988] → [7.3716:3752]

B:BD[7.3716] → [7.3716:3752]

B:BD[7.3752] → [8.5989:6039]

∅:D[8.6039] → [7.3752:3855]

B:BD[7.3752] → [7.3752:3855]

            AppMessage::Kakoune(Request::Draw(lines, default_face, _padding_face)) => {
                self.lines = lines;
                self.default_face = default_face;
                if let Some(rs) = &self.render_state {
                    rs.window.request_redraw();

[7.3645]

[7.3855]

            AppMessage::Kakoune(kak) => match kak {
                Request::Draw(lines, default_face, _padding_face) => {
                    self.lines = lines;
                    self.default_face = default_face;
                    if let Some(rs) = &self.render_state {
                        rs.window.request_redraw();
                    }

Replacement in src/main.rs at line 178 [4.49]

B:BD[7.3873] → [7.3873:3887]

[7.3873]

[6.481]

                Request::DrawStatus(status_line, mode, default_face) => {
                    self.status_line = status_line;
                    if let Some(rs) = &self.render_state {
                        rs.window.request_redraw();
                    }
                }
                _ => {}
            },

feat: Render status line

Dependencies

In channels

Change contents

Insertion in src/render.rs at line 33 [3.34]

Insertion in src/render.rs at line 68 [3.34]

Replacement in src/render.rs at line 72 [3.34]