Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 16 additions & 40 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ ratatui = { version = "0.30", default-features = false, features = ["all-widgets
console_error_panic_hook = "0.1.7"
thiserror = "2.0.18"
bitvec = { version = "1.0.1", default-features = false, features = ["alloc", "std"] }
beamterm-renderer = "0.17.0"
beamterm-renderer = "1"
unicode-width = "0.2.2"

[dev-dependencies]
Expand Down
15 changes: 7 additions & 8 deletions src/backend/webgl2.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
error::Error,
event::{KeyEvent, MouseEvent},
render::WebEventHandler,
CursorShape,
CellSized, CursorShape,
};
pub use beamterm_renderer::SelectionMode;
use beamterm_renderer::{
Expand All @@ -29,7 +29,6 @@
};
use web_sys::{wasm_bindgen::JsCast, Element};

use crate::backend::cell_sized::CellSized;
/// Re-export beamterm's atlas data type. Used by [`FontAtlasConfig::Static`].
pub use beamterm_renderer::FontAtlasData;

Expand Down Expand Up @@ -624,7 +623,7 @@
.is_some();
if self.cursor_over_hyperlink != is_over {
self.cursor_over_hyperlink = is_over;
Self::update_canvas_cursor_style(&self.beamterm.canvas(), is_over);

Check warning on line 626 in src/backend/webgl2.rs

View workflow job for this annotation

GitHub Actions / clippy

this expression creates a reference which is immediately dereferenced by the compiler

warning: this expression creates a reference which is immediately dereferenced by the compiler --> src/backend/webgl2.rs:626:50 | 626 | Self::update_canvas_cursor_style(&self.beamterm.canvas(), is_over); | ^^^^^^^^^^^^^^^^^^^^^^^ help: change this to: `self.beamterm.canvas()` | = help: for further information visit https://rust-lang.github.io/rust-clippy/rust-1.94.0/index.html#needless_borrow = note: `#[warn(clippy::needless_borrow)]` on by default
}
}

Expand Down Expand Up @@ -680,8 +679,8 @@

impl CellSized for WebGl2Backend {
fn cell_size_px(&self) -> (f32, f32) {
let (w, h) = self.beamterm.cell_size();
(w as f32, h as f32)
let cs = self.beamterm.cell_size();
(cs.width as f32, cs.height as f32)
}

fn cell_size_css_px(&self) -> (f32, f32) {
Expand Down Expand Up @@ -747,16 +746,16 @@
}

fn size(&self) -> IoResult<Size> {
let (w, h) = self.beamterm.terminal_size();
Ok(Size::new(w, h))
let ts = self.beamterm.terminal_size();
Ok(Size::new(ts.cols, ts.rows))
}

fn window_size(&mut self) -> IoResult<WindowSize> {
let (cols, rows) = self.beamterm.terminal_size();
let ts = self.beamterm.terminal_size();
let (w, h) = self.beamterm.canvas_size();

Ok(WindowSize {
columns_rows: Size::new(cols, rows),
columns_rows: Size::new(ts.cols, ts.rows),
pixels: Size::new(w as _, h as _),
})
}
Expand Down Expand Up @@ -835,7 +834,7 @@
/// A `Debug`-derive friendly convenience wrapper
#[derive(Clone)]
struct HyperlinkCallback {
callback: Rc<RefCell<dyn FnMut(&str)>>,

Check warning on line 837 in src/backend/webgl2.rs

View workflow job for this annotation

GitHub Actions / clippy

very complex type used. Consider factoring parts into `type` definitions

warning: very complex type used. Consider factoring parts into `type` definitions --> src/backend/webgl2.rs:837:15 | 837 | callback: Rc<RefCell<dyn FnMut(&str)>>, | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | = help: for further information visit https://rust-lang.github.io/rust-clippy/rust-1.94.0/index.html#type_complexity = note: `#[warn(clippy::type_complexity)]` on by default
}

impl HyperlinkCallback {
Expand Down
Loading