Implement fullscreen functionality

src/converter.rs

@@ -49,7 +49,7 @@ pub async fn run_conversion_loop(
 		let Some((page_info, new_iter)) = (idx_start..page)
 			.interleave(page..idx_end)
 			.enumerate()
-			.skip(*iteration)
+			// .skip(*iteration)
 			.find_map(|(i_idx, p_idx)| images[p_idx].take().map(|p| (p, i_idx)))
 		else {
 			return Ok(None);

src/main.rs

@@ -45,6 +45,8 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
 		optional -r,--r-to-l r_to_l: bool
 		/// The maximum number of pages to display together, horizontally, at a time
 		optional -m,--max-wide max_wide: NonZeroUsize
+		/// Fullscreen the pdf (hide document name, page count, etc)
+		optional -f,--fullscreen fullscreen: bool
 		/// PDF file to read
 		required file: PathBuf
 	};
@@ -167,8 +169,9 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
 	)?;
 	enable_raw_mode()?;
 
-	let mut main_area = Tui::main_layout(&term.get_frame());
+	let mut fullscreen = flags.fullscreen.unwrap_or_default();
-	tui_tx.send(RenderNotif::Area(main_area[1]))?;
+	let mut main_area = Tui::main_layout(&term.get_frame(), fullscreen);
+	tui_tx.send(RenderNotif::Area(main_area.page_area))?;
 
 	let mut tui_rx = tui_rx.into_stream();
 	let mut from_converter = from_converter.into_stream();
@@ -191,7 +194,8 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
 							to_converter.send(ConverterMsg::GoToPage(page))?;
 						},
 						InputAction::Search(term) => tui_tx.send(RenderNotif::Search(term))?,
-						InputAction::Invert => tui_tx.send(RenderNotif::Invert)?
+						InputAction::Invert => tui_tx.send(RenderNotif::Invert)?,
+						InputAction::Fullscreen => fullscreen = !fullscreen,
 					}
 				}
 			},
@@ -219,10 +223,10 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
 			},
 		};
 
-		let new_area = Tui::main_layout(&term.get_frame());
+		let new_area = Tui::main_layout(&term.get_frame(), fullscreen);
 		if new_area != main_area {
 			main_area = new_area;
-			tui_tx.send(RenderNotif::Area(main_area[1]))?;
+			tui_tx.send(RenderNotif::Area(main_area.page_area))?;
 			needs_redraw = true;
 		}
 

src/renderer.rs

@@ -136,6 +136,11 @@ pub fn start_rendering(
 		fill_default::<PrevRender>(&mut rendered, n_pages);
 		let mut start_point = 0;
 
+		// This is kinda a weird way of doing this, but if we get a notification that the area
+		// changed, we want to start re-rending all of the pages, but we don't want to reload the
+		// document. If there was a mechanism to say 'start this for-loop over' then I would do
+		// that, but I don't think such a thing exists, so this is our attempt
+		'render_pages: loop {
 			// next, we gotta wait 'til we get told what the current starting area is so that we can
 			// set it to know what to render to
 			let area = match preserved_area {
@@ -151,11 +156,6 @@ pub fn start_rendering(
 				}
 			};
 
-		// This is kinda a weird way of doing this, but if we get a notification that the area
-		// changed, we want to start re-rending all of the pages, but we don't want to reload the
-		// document. If there was a mechanism to say 'start this for-loop over' then I would do
-		// that, but I don't think such a thing exists, so this is our attempt
-		'render_pages: loop {
 			// what we do with a notif is the same regardless of if we're in the middle of
 			// rendering the list of pages or we're all done
 			macro_rules! handle_notif {
@@ -170,18 +170,10 @@ pub fn start_rendering(
 							continue 'render_pages;
 						}
 						RenderNotif::Area(new_area) => {
-							let bigger =
-								new_area.width > area.width || new_area.height > area.height;
 							preserved_area = Some(new_area);
-							// we only want to re-render pages if the new area is greater than the old
-							// one, 'cause then we might need sharper images to make it all look good.
-							// If the new area is smaller, then the same high-quality-rendered images
-							// will still look fine, so it's ok to leave it.
-							if bigger {
 							fill_default(&mut rendered, n_pages);
 							continue 'render_pages;
 						}
-						}
 						RenderNotif::JumpToPage(page) => {
 							start_point = page;
 							continue 'render_pages;

src/tui.rs

@@ -1,4 +1,4 @@
-use std::{borrow::Cow, io::stdout, num::NonZeroUsize, rc::Rc};
+use std::{borrow::Cow, io::stdout, num::NonZeroUsize};
 
 use crossterm::{
 	event::{Event, KeyCode, KeyModifiers, MouseEventKind},
@@ -79,6 +79,12 @@ struct RenderedInfo {
 	num_results: Option<usize>
 }
 
+#[derive(PartialEq)]
+pub struct RenderLayout {
+	pub page_area: Rect,
+	pub top_and_bottom: Option<(Rect, Rect)>
+}
+
 impl Tui {
 	pub fn new(name: String, max_wide: Option<NonZeroUsize>, r_to_l: bool) -> Tui {
 		Self {
@@ -93,8 +99,14 @@ impl Tui {
 		}
 	}
 
-	pub fn main_layout(frame: &Frame<'_>) -> Rc<[Rect]> {
+	pub fn main_layout(frame: &Frame<'_>, fullscreened: bool) -> RenderLayout {
-		Layout::default()
+		if fullscreened {
+			RenderLayout {
+				page_area: frame.area(),
+				top_and_bottom: None
+			}
+		} else {
+			let layout = Layout::default()
 				.constraints([
 					Constraint::Length(3),
 					Constraint::Fill(1),
@@ -102,16 +114,23 @@ impl Tui {
 				])
 				.horizontal_margin(2)
 				.vertical_margin(1)
-			.split(frame.area())
+				.split(frame.area());
+
+			RenderLayout {
+				page_area: layout[1],
+				top_and_bottom: Some((layout[0], layout[2]))
+			}
+		}
 	}
 
 	// TODO: Make a way to fill the width of the screen with one page and scroll down to view it
-	pub fn render(&mut self, frame: &mut Frame<'_>, main_area: &[Rect]) {
+	pub fn render(&mut self, frame: &mut Frame<'_>, full_layout: &RenderLayout) {
 		if self.showing_help_msg {
 			self.render_help_msg(frame);
 			return;
 		}
 
+		if let Some((top_area, bottom_area)) = full_layout.top_and_bottom {
 			let top_block = Block::new()
 				.padding(Padding {
 					right: 2,
@@ -120,7 +139,7 @@ impl Tui {
 				})
 				.borders(Borders::BOTTOM);
 
-		let top_area = top_block.inner(main_area[0]);
+			let top_area = top_block.inner(top_area);
 
 			let page_nums_text = format!("{} / {}", self.page + 1, self.rendered.len());
 
@@ -134,7 +153,7 @@ impl Tui {
 
 			let page_nums = Span::styled(&page_nums_text, Style::new().fg(Color::Cyan));
 
-		frame.render_widget(top_block, main_area[0]);
+			frame.render_widget(top_block, top_area);
 			frame.render_widget(title, top_layout[0]);
 			frame.render_widget(page_nums, top_layout[1]);
 
@@ -146,9 +165,9 @@ impl Tui {
 					bottom: 0
 				})
 				.borders(Borders::TOP);
-		let bottom_area = bottom_block.inner(main_area[2]);
+			let bottom_inside_block = bottom_block.inner(bottom_area);
 
-		frame.render_widget(bottom_block, main_area[2]);
+			frame.render_widget(bottom_block, bottom_area);
 
 			let rendered_str = if !self.rendered.is_empty() {
 				format!(
@@ -163,7 +182,7 @@ impl Tui {
 				Constraint::Fill(1),
 				Constraint::Length(rendered_str.len() as u16)
 			])
-		.split(bottom_area);
+			.split(bottom_inside_block);
 
 			let rendered_span = Span::styled(&rendered_str, Style::new().fg(Color::Cyan));
 			frame.render_widget(rendered_span, bottom_layout[1]);
@@ -204,8 +223,9 @@ impl Tui {
 
 			let span = Span::styled(msg_str, Style::new().fg(color));
 			frame.render_widget(span, bottom_layout[0]);
+		}
 
-		let mut img_area = main_area[1];
+		let mut img_area = full_layout.page_area;
 
 		let size = frame.area();
 		if size == self.last_render.rect {
@@ -424,6 +444,7 @@ impl Tui {
 								self.showing_help_msg = true;
 								Some(InputAction::Redraw)
 							}
+							'f' => Some(InputAction::Fullscreen),
 							'n' if self.page < self.rendered.len() - 1 => {
 								// TODO: If we can't find one, then maybe like block until we've verified
 								// all the pages have been checked?
@@ -687,7 +708,8 @@ pub enum InputAction {
 	JumpingToPage(usize),
 	Search(String),
 	QuitApp,
-	Invert
+	Invert,
+	Fullscreen
 }
 
 #[derive(Copy, Clone)]