Compare commits

..

6 Commits

Author SHA1 Message Date
itsjunetime 15b1a99d76 Add changelog entry 2025-11-06 19:23:39 -06:00
itsjunetime 170bdd3869 Fix weird cropping when zooming out too much with kitty 2025-11-06 19:22:52 -06:00
June 7551c4dba3 Update deps and fmt (#110) 2025-11-06 18:50:19 -06:00
itsjunetime e61eb9b846 Fix r_to_l argument as well to just be a flag 2025-11-06 18:21:18 -06:00
tatounee 6b37976357 Made flags -f, --fullscreen not taking argument (#109)
Now, its presence alone is enough to activate the full-screen option.
2025-11-06 18:18:57 -06:00
June 3628d21c74 Switch to stable base64 simd library (#105) 2025-09-29 17:00:29 -05:00
5 changed files with 313 additions and 492 deletions
+2
View File
@@ -1,6 +1,8 @@
# Unreleased # Unreleased
- Switched simd base64 crate for one that works on stable (from `vb64` to `base64_simd`) - Switched simd base64 crate for one that works on stable (from `vb64` to `base64_simd`)
- Allow boolean arguments to function as flags, without a `true` or `false` argument following the flag itself
- Fix cropping issues when zooming out too much while using kitty protocol
# v0.4.3 # v0.4.3
Generated
+285 -466
View File
File diff suppressed because it is too large Load Diff
+2 -2
View File
@@ -49,7 +49,7 @@ log = "0.4.27"
flexi_logger = "0.31" flexi_logger = "0.31"
# for tracing with tokio-console # for tracing with tokio-console
console-subscriber = { version = "0.4.0", optional = true } console-subscriber = { version = "0.5.0", optional = true }
csscolorparser = { version = "0.7.0" } csscolorparser = { version = "0.7.0" }
[profile.production] [profile.production]
@@ -92,7 +92,7 @@ checked_conversions = "warn"
copy_iterator = "warn" copy_iterator = "warn"
default_trait_access = "warn" default_trait_access = "warn"
doc_link_with_quotes = "warn" doc_link_with_quotes = "warn"
empty_enum = "warn" empty_enums = "warn"
explicit_into_iter_loop = "warn" explicit_into_iter_loop = "warn"
explicit_iter_loop = "warn" explicit_iter_loop = "warn"
filter_map_next = "warn" filter_map_next = "warn"
+4 -9
View File
@@ -83,11 +83,11 @@ async fn inner_main() -> Result<(), WrappedErr> {
let flags = xflags::parse_or_exit! { let flags = xflags::parse_or_exit! {
/// Display the pdf with the pages starting at the right hand size and moving left and /// Display the pdf with the pages starting at the right hand size and moving left and
/// adjust input keys to match /// adjust input keys to match
optional -r,--r-to-l r_to_l: bool optional -r,--r-to-l
/// The maximum number of pages to display together, horizontally, at a time /// The maximum number of pages to display together, horizontally, at a time
optional -m,--max-wide max_wide: NonZeroUsize optional -m,--max-wide max_wide: NonZeroUsize
/// Fullscreen the pdf (hide document name, page count, etc) /// Fullscreen the pdf (hide document name, page count, etc)
optional -f,--fullscreen fullscreen: bool optional -f,--fullscreen
/// The number of pages to prerender surrounding the currently-shown page; 0 means no /// The number of pages to prerender surrounding the currently-shown page; 0 means no
/// limit. By default, there is no limit. /// limit. By default, there is no limit.
optional -p,--prerender prerender: usize optional -p,--prerender prerender: usize
@@ -267,12 +267,7 @@ async fn inner_main() -> Result<(), WrappedErr> {
|| "Unknown file".into(), || "Unknown file".into(),
|n| n.to_string_lossy().to_string() |n| n.to_string_lossy().to_string()
); );
let tui = Tui::new( let tui = Tui::new(file_name, flags.max_wide, flags.r_to_l, is_kitty);
file_name,
flags.max_wide,
flags.r_to_l.unwrap_or_default(),
is_kitty
);
let backend = CrosstermBackend::new(std::io::stdout()); let backend = CrosstermBackend::new(std::io::stdout());
let mut term = Terminal::new(backend).map_err(|e| { let mut term = Terminal::new(backend).map_err(|e| {
@@ -300,7 +295,7 @@ async fn inner_main() -> Result<(), WrappedErr> {
})?; })?;
} }
let fullscreen = flags.fullscreen.unwrap_or_default(); let fullscreen = flags.fullscreen;
let main_area = Tui::main_layout(&term.get_frame(), fullscreen); let main_area = Tui::main_layout(&term.get_frame(), fullscreen);
to_renderer to_renderer
.send(RenderNotif::Area(main_area.page_area)) .send(RenderNotif::Area(main_area.page_area))
+20 -15
View File
@@ -205,23 +205,28 @@ impl Tui {
log::debug!("zoom is now {zoom:#?}"); log::debug!("zoom is now {zoom:#?}");
log::debug!("img_area is {img_area:#?}"); log::debug!("img_area is {img_area:#?}");
log::debug!("img dimensions are {cell_w}x{cell_h}");
if zoom.level < 0 {
img_area = Rect {
width: img_area
.width
.saturating_sub((zoom.level * 2).unsigned_abs())
.max(1),
x: img_area.x + (zoom.level.unsigned_abs().min(img_area.width / 2)),
..img_area
}
}
log::debug!("after adjustment, img_area is {img_area:#?}");
// Ugh I don't like this logic. I wish we could simplify it.
let img_width = f32::from(cell_w); let img_width = f32::from(cell_w);
let img_height = f32::from(cell_h); let img_height = f32::from(cell_h);
let img_aspect_ratio = img_width / img_height;
if zoom.level < 0 {
let old_width = img_area.width;
img_area.width = img_area
.width
.saturating_sub((zoom.level * 2).unsigned_abs())
.max((f32::from(img_area.height) * img_aspect_ratio) as u16);
img_area.x += (old_width - img_area.width) / 2;
log::debug!("after adjustment, img_area is {img_area:#?}");
// TODO: Find a way to detect when we've hit the maximum zoom-out and stop
// more zooming out
}
// Ugh I don't like this logic. I wish we could simplify it.
let img_area_width = f32::from(img_area.width); let img_area_width = f32::from(img_area.width);
let img_area_height = f32::from(img_area.height); let img_area_height = f32::from(img_area.height);
let available_to_real_width_ratio = img_area_width / img_width; let available_to_real_width_ratio = img_area_width / img_width;
@@ -787,7 +792,7 @@ impl Tui {
} }
} }
// I want this to always return 0 'cause I just use it to return from `Self::handle_event`] // I want this to always return an option 'cause I just use it to return from `Self::handle_event`
#[expect(clippy::unnecessary_wraps)] #[expect(clippy::unnecessary_wraps)]
fn update_zoom(&mut self, f: impl FnOnce(&mut Zoom)) -> Option<InputAction> { fn update_zoom(&mut self, f: impl FnOnce(&mut Zoom)) -> Option<InputAction> {
if let Some(z) = &mut self.zoom { if let Some(z) = &mut self.zoom {