Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add options for overriding terminal dimensions #15

Merged
merged 1 commit into from
Sep 11, 2022
Merged

Add options for overriding terminal dimensions #15

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 17 additions & 7 deletions src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,14 @@ struct Cli {
#[clap(long, default_value_t = 30)]
fps_cap: u8,

/// Override terminal width (number of columns)
#[clap(long)]
cols: Option<usize>,

/// Override terminal height (number of rows)
#[clap(long)]
rows: Option<usize>,

/// Enable verbose logging
#[clap(short, long, action = ArgAction::Count)]
verbose: u8,
Expand All @@ -181,24 +189,26 @@ fn main() -> Result<()> {
env_logger::Builder::from_env(env_logger::Env::default().default_filter_or(log_level)).init();

let (header, events) = asciicast::open(&cli.input_filename)?;
let stdout = asciicast::stdout(events);

let terminal_size = (
cli.cols.unwrap_or(header.terminal_size.0),
cli.rows.unwrap_or(header.terminal_size.1),
);

let itl = cli
.idle_time_limit
.or(header.idle_time_limit)
.unwrap_or(5.0);

let stdout = asciicast::stdout(events);
let stdout = events::limit_idle_time(stdout, itl);
let stdout = events::accelerate(stdout, cli.speed);
let stdout = events::batch(stdout, cli.fps_cap);
let stdout = stdout.collect::<Vec<_>>();
let count = stdout.len() as u64;
let frames = vt::frames(stdout.into_iter(), header.terminal_size);
let frames = vt::frames(stdout.into_iter(), terminal_size);

info!(
"terminal size: {}x{}",
header.terminal_size.0, header.terminal_size.1
);
info!("terminal size: {}x{}", terminal_size.0, terminal_size.1);

let (font_db, font_family) = fonts::init(&cli.font_dir, &cli.font_family)
.ok_or_else(|| anyhow!("no faces matching font family {}", cli.font_family))?;
Expand All @@ -215,7 +225,7 @@ fn main() -> Result<()> {
let theme: Theme = theme_opt.into();

let settings = renderer::Settings {
terminal_size: header.terminal_size,
terminal_size,
font_db,
font_family,
font_size: cli.font_size,
Expand Down