cadrgtsecond/mosham - Change JXSQGDJPUCHCI46LU3CMARIDRXI7DN2QLVLM3C55APMTBXFKXV7QC

Remove caching of run making as it doesnt seem that important

Created by cadrgtsecond today at 05:35

JXSQGDJPUCHCI46LU3CMARIDRXI7DN2QLVLM3C55APMTBXFKXV7QC

Dependencies

In channels

main

Change contents

Insertion in src/render.rs at line 20 [3.34]
[3.316]
[4.115]
```
#[derive(Debug)]
```
Deletion in src/render.rs at line 43 [3.34]
B:BD[4.545] → [4.545:568]
```
    cache: ShapeCache,
```

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

B:BD[2.191] → [2.191:322]

fn shape(
    plans: &mut Plans,
    index: FontIndex,
    font: &rustybuzz::Face,
    mut ubuf: UnicodeBuffer,
) -> GlyphBuffer {

[2.191]

[2.322]

fn shape(plans: &mut Plans, index: FontIndex, font: &rustybuzz::Face, text: &str) -> GlyphBuffer {
    let mut ubuf = UnicodeBuffer::new();
    ubuf.push_str(text);

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

∅:D[5.482] → [6.926:1033]

∅:D[4.644] → [6.926:1033]

∅:D[2.921] → [6.926:1033]

B:BD[6.926] → [6.926:1033]

B:BD[6.1033] → [2.922:952]

∅:D[2.952] → [6.1068:1117]

B:BD[6.1068] → [6.1068:1117]

        let res = self.cache.entry(line.clone()).or_insert_with(|| {
            let mut res = Vec::new();
            let mut font = 0;
            let slice: &[json_ui::Atom] = &line;

[2.921]

[7.0]

        let mut res = Vec::new();
        let mut font = 0;
        let slice: &[json_ui::Atom] = &line;

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

∅:D[7.1] → [6.1117:1149]

B:BD[6.1117] → [6.1117:1149]

B:BD[6.1149] → [7.2:55]

B:BD[7.55] → [8.0:49]

B:BD[8.49] → [2.953:1000]

∅:D[9.155] → [6.1281:1312]

∅:D[2.1000] → [6.1281:1312]

B:BD[6.1281] → [6.1281:1312]

            for atom in slice {
                let mut ubuf = UnicodeBuffer::new();
                for c in atom.contents.chars() {
                    let Some(curr_font) = self
                        .fonts

[7.1]

[6.1312]

        for atom in slice {
            let mut text = String::new();
            for c in atom.contents.chars() {
                let Some(curr_font) = (if self.fonts[font].1.unicode_ranges().contains_char(c) {
                    Some(font)
                } else {
                    self.fonts

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

B:BD[6.1421] → [9.156:183]

B:BD[9.183] → [2.1001:1164]

∅:D[2.1164] → [9.183:217]

B:BD[9.183] → [9.183:217]

                    else {
                        // TODO: Render fallback character
                        // For new we'll just use a standin
                        ubuf.add('⋄', 2);
                        continue;

[6.1421]

[9.217]

                }) else {
                    // TODO: Render fallback character
                    // For new we'll just use a standin
                    text.push('⋄');
                    continue;
                };
                if font != curr_font {
                    let rb_font = &self.fonts[font].1;
                    let glyph_buffer = shape(&mut self.plans, font, rb_font, &text);
                    let run = Run {
                        fg: atom.face.fg.to_rgba(config).unwrap_or(default_fg),
                        bg: atom.face.bg.to_rgba(config),
                        font_size,
                        font,
                        glyph_buffer,
                        upe: rb_font.units_per_em(),

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

B:BD[9.240] → [2.1165:1355]

∅:D[2.1355] → [7.225:278]

B:BD[6.1805] → [7.225:278]

B:BD[7.278] → [4.645:684]

B:BD[4.684] → [2.1356:1575]

∅:D[2.1575] → [4.782:909]

B:BD[4.782] → [4.782:909]

B:BD[4.909] → [2.1576:1618]

∅:D[2.1618] → [8.94:262]

B:BD[6.2090] → [8.94:262]

∅:D[8.262] → [6.2125:2147]

B:BD[6.2125] → [6.2125:2147]

                    if font != curr_font {
                        let rb_font = &self.fonts[font].1;
                        let glyph_buffer = shape(&mut self.plans, font, rb_font, ubuf);
                        ubuf = UnicodeBuffer::new();
                        res.push(Run {
                            fg: atom.face.fg.to_rgba(config).unwrap_or(default_fg),
                            bg: atom.face.bg.to_rgba(config),
                            font_size,
                            font,
                            glyph_buffer,
                            upe: rb_font.units_per_em(),
                        });
                        font = curr_font;
                    }
                    if c == '\n' {
                        ubuf.add(' ', 2);
                    } else {
                        ubuf.add(c, 2);
                    }

[9.240]

[6.2240]

                    text.clear();
                    res.push(run);
                    font = curr_font;

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

B:BD[6.2258] → [2.1619:1750]

∅:D[2.1750] → [4.910:941]

B:BD[6.2514] → [4.910:941]

B:BD[4.941] → [2.1751:1938]

∅:D[2.1938] → [4.1023:1126]

B:BD[4.1023] → [4.1023:1126]

                let rb_font = &self.fonts[font].1;
                let glyph_buffer = shape(&mut self.plans, font, rb_font, ubuf);
                res.push(Run {
                    fg: atom.face.fg.to_rgba(config).unwrap_or(default_fg),
                    bg: atom.face.bg.to_rgba(config),
                    font_size,
                    font,
                    glyph_buffer,
                    upe: rb_font.units_per_em(),
                });

[6.2258]

[6.2709]

                if c == '\n' {
                    text.push(' ');
                } else {
                    text.push(c);
                }

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

B:BD[6.2723] → [5.637:668]

∅:D[5.668] → [6.2747:2759]

B:BD[6.2747] → [6.2747:2759]

B:BD[6.2759] → [10.0:22]

B:BD[10.22] → [5.669:691]

∅:D[5.691] → [10.23:97]

B:BD[6.2774] → [10.23:97]

B:BD[10.97] → [2.1939:1967]

∅:D[2.1967] → [10.125:150]

B:BD[10.125] → [10.125:150]

B:BD[10.150] → [2.1968:1985]

∅:D[2.1985] → [10.167:178]

B:BD[10.167] → [10.167:178]

            (true, res.into())
        });
        res.0 = true;
        res.1.clone()
    }
    fn clear_cache(&mut self) {
        self.cache.retain(|_, v| {
            let used = v.0;
            v.0 = false;
            used
        })

[6.2723]

[3.2559]

            let rb_font = &self.fonts[font].1;
            let glyph_buffer = shape(&mut self.plans, font, rb_font, &text);
            let run = Run {
                fg: atom.face.fg.to_rgba(config).unwrap_or(default_fg),
                bg: atom.face.bg.to_rgba(config),
                font_size,
                font,
                glyph_buffer,
                upe: rb_font.units_per_em(),
            };
            res.push(run);
        }
        res.into()

Replacement in src/render.rs at line 121 [3.34]
B:BD[3.2568] → [6.2775:2794]
```
#[derive(Default)]
```
[3.2568]
[6.2794]
```
#[derive(Debug, Default)]
```
Deletion in src/render.rs at line 173 [3.34]
B:BD[2.2617] → [2.2617:2643]
```
    shaper.cache.clear();
```

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

[5.1871]

[2.4188]

        if gpos.x_offset < 0 {
            continue;
        }

Deletion in src/render.rs at line 400 [3.34]
B:BD[2.10319] → [2.10319:10345]
```
    shaper.clear_cache();
```