PolytreeDE/alacritty
1
0
Fork 0
mirror of https://github.com/alacritty/alacritty.git synced 2024-11-18 13:55:23 -05:00
Code Releases Activity

Move copypasta & font to 2018, fix windows specific code

Browse source
This commit is contained in:
Zac Pullar-Strecker 2018-12-07 10:11:19 +13:00 committed by Christian Duerr
parent 0fd6a6830a
commit a5aef17d8f
No known key found for this signature in database
GPG key ID: 85CDAE3C164BA7B4
4 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
copypasta/src/lib.rs
View file

@ -85,4 +85,4 @@ pub use macos::{Clipboard, Error};
#[cfg(windows)] #[cfg(windows)]
mod windows; mod windows;
#[cfg(windows)] #[cfg(windows)]
pub use windows::{Clipboard, Error}; pub use crate::windows::{Clipboard, Error};

8
font/src/lib.rs
View file

@ -58,7 +58,7 @@ pub use ft::{Error, FreeTypeRasterizer as Rasterizer};
#[cfg(windows)] #[cfg(windows)]
pub mod rusttype; pub mod rusttype;
#[cfg(windows)] #[cfg(windows)]
pub use rusttype::{Error, RustTypeRasterizer as Rasterizer}; pub use crate::rusttype::{Error, RustTypeRasterizer as Rasterizer};
// If target is macos, reexport everything from darwin // If target is macos, reexport everything from darwin
#[cfg(target_os = "macos")] #[cfg(target_os = "macos")]
@ -348,13 +348,13 @@ pub trait Rasterize {
Self: Sized; Self: Sized;
/// Get `Metrics` for the given `FontKey` /// Get `Metrics` for the given `FontKey`
fn metrics(&self, FontKey, Size) -> Result<Metrics, Self::Err>; fn metrics(&self, _: FontKey, _: Size) -> Result<Metrics, Self::Err>;
/// Load the font described by `FontDesc` and `Size` /// Load the font described by `FontDesc` and `Size`
fn load_font(&mut self, &FontDesc, Size) -> Result<FontKey, Self::Err>; fn load_font(&mut self, _: &FontDesc, _: Size) -> Result<FontKey, Self::Err>;
/// Rasterize the glyph described by `GlyphKey`. /// Rasterize the glyph described by `GlyphKey`.
fn get_glyph(&mut self, GlyphKey) -> Result<RasterizedGlyph, Self::Err>; fn get_glyph(&mut self, _: GlyphKey) -> Result<RasterizedGlyph, Self::Err>;
/// Update the Rasterizer's DPI factor /// Update the Rasterizer's DPI factor
fn update_dpr(&mut self, device_pixel_ratio: f32); fn update_dpr(&mut self, device_pixel_ratio: f32);

2
font/src/rusttype/mod.rs
View file

@ -11,7 +11,7 @@ pub struct RustTypeRasterizer {
dpi_ratio: f32, dpi_ratio: f32,
} }
impl ::Rasterize for RustTypeRasterizer { impl crate::Rasterize for RustTypeRasterizer {
type Err = Error; type Err = Error;
fn new(device_pixel_ratio: f32, _: bool) -> Result<RustTypeRasterizer, Error> { fn new(device_pixel_ratio: f32, _: bool) -> Result<RustTypeRasterizer, Error> {

10
src/tty/windows.rs
View file

@ -31,11 +31,11 @@ use winapi::shared::winerror::WAIT_TIMEOUT;
use winpty::{ConfigFlags, MouseMode, SpawnConfig, SpawnFlags, Winpty}; use winpty::{ConfigFlags, MouseMode, SpawnConfig, SpawnFlags, Winpty};
use winpty::Config as WinptyConfig; use winpty::Config as WinptyConfig;
use config::{Config, Shell}; use crate::config::{Config, Shell};
use display::OnResize; use crate::display::OnResize;
use cli::Options; use crate::cli::Options;
use tty::EventedReadWrite; use crate::tty::EventedReadWrite;
use term::SizeInfo; use crate::term::SizeInfo;
/// Handle to the winpty agent process. Required so we know when it closes. /// Handle to the winpty agent process. Required so we know when it closes.
static mut HANDLE: *mut c_void = 0usize as *mut c_void; static mut HANDLE: *mut c_void = 0usize as *mut c_void;