macos-click-through
Jaffar Mohammed 3 years ago
parent f179760c39
commit 9b8907c8c7

812
Cargo.lock generated

File diff suppressed because it is too large Load Diff

@ -16,53 +16,53 @@ default = []
embed-fonts = [] embed-fonts = []
[dependencies] [dependencies]
serde = { version = "1.0", features = ["derive"] } async-trait = "0.1.53"
serde_json = "1.0" cfg-if = "1.0.0"
clap = { version = "3.1.9", features = ["cargo"] }
clipboard = "0.5.0"
derive-new = "0.5.9"
dirs = "4.0.0"
euclid = "0.22.7"
flexi_logger = { version = "0.22.3", default-features = false }
futures = "0.3.21"
gl = "0.14.0"
glutin = { git = "https://github.com/neovide/glutin", branch = "new-keyboard-all", features = ["serde"] }
image = { version = "0.24.1", default-features = false, features = ["ico"] }
lazy_static = "1.4.0"
log = "0.4.16"
lru = "0.7.5"
neovide-derive = { path = "neovide-derive" } neovide-derive = { path = "neovide-derive" }
euclid = "0.20.7"
lru = "0.4.3"
derive-new = "0.5"
rmpv = "1.0.0"
image = { version = "0.22.3", default-features = false, features = ["ico"] }
nvim-rs = { git = "https://github.com/KillTheMule/nvim-rs", branch = "master", features = ["use_tokio"] } nvim-rs = { git = "https://github.com/KillTheMule/nvim-rs", branch = "master", features = ["use_tokio"] }
tokio = { version = "1.1.1", features = ["full"] } parking_lot = "0.12.0"
tokio-util = "0.6.7" pin-project = "1.0.10"
async-trait = "0.1.18" rand = "0.8.5"
lazy_static = "1.4.0" rmpv = "1.0.0"
unicode-segmentation = "1.6.0" serde = { version = "1.0.136", features = ["derive"] }
log = "0.4.8" serde_json = "1.0.79"
flexi_logger = { version = "0.17.1", default-features = false }
parking_lot = "0.10.0"
cfg-if = "0.1.10"
which = "4"
dirs = "2"
rand = "0.7"
pin-project = "0.4.27"
futures = "0.3.12"
glutin = { git = "https://github.com/neovide/glutin", branch = "new-keyboard-all", features=["serde"] }
winit = { git = "https://github.com/neovide/winit", branch = "new-keyboard-all" }
gl = "0.14.0"
swash = "0.1.4" swash = "0.1.4"
clap="2.33.3" tokio = { version = "1.17.0", features = ["full"] }
xdg="2.4.0" tokio-util = { version = "0.7.1", features = ["compat"] }
clipboard="0.5.0" unicode-segmentation = "1.9.0"
which = "4.2.5"
winit = { git = "https://github.com/neovide/winit", branch = "new-keyboard-all" }
xdg = "2.4.1"
[dev-dependencies] [dev-dependencies]
mockall = "0.7.0" mockall = "0.11.0"
[target.'cfg(windows)'.dependencies] [target.'cfg(windows)'.dependencies]
winapi = { version = "0.3.9", features = ["winuser"] } winapi = { version = "0.3.9", features = ["winuser"] }
[target.'cfg(windows)'.build-dependencies] [target.'cfg(windows)'.build-dependencies]
winres = "0.1.11" winres = "0.1.12"
[target.'cfg(linux)'.dependencies.skia-safe] [target.'cfg(linux)'.dependencies.skia-safe]
features = ["gl", "egl"] features = ["gl", "egl"]
version = "^0.42.1" version = "0.49.1"
[target.'cfg(not(linux))'.dependencies.skia-safe] [target.'cfg(not(linux))'.dependencies.skia-safe]
features = ["gl"] features = ["gl"]
version = "^0.42.1" version = "0.49.1"
[profile.release] [profile.release]
debug = true debug = true

@ -1,6 +1,6 @@
use crate::{dimensions::Dimensions, frame::Frame, settings::*}; use crate::{dimensions::Dimensions, frame::Frame, settings::*};
use clap::{App, Arg}; use clap::{Arg, Command};
#[derive(Clone, Debug)] #[derive(Clone, Debug)]
pub struct CmdLineSettings { pub struct CmdLineSettings {
@ -50,94 +50,94 @@ impl Default for CmdLineSettings {
} }
pub fn handle_command_line_arguments(args: Vec<String>) -> Result<(), String> { pub fn handle_command_line_arguments(args: Vec<String>) -> Result<(), String> {
let clapp = App::new("Neovide") let clapp = Command::new("Neovide")
.version(crate_version!()) .version(crate_version!())
.author(crate_authors!()) .author(crate_authors!())
.about(crate_description!()) .about(crate_description!())
// Pass through arguments // Pass through arguments
.arg( .arg(
Arg::with_name("files_to_open") Arg::new("files_to_open")
.multiple(true) .multiple_values(true)
.takes_value(true) .takes_value(true)
.help("Files to open"), .help("Files to open"),
) )
.arg( .arg(
Arg::with_name("neovim_args") Arg::new("neovim_args")
.multiple(true) .multiple_values(true)
.takes_value(true) .takes_value(true)
.last(true) .last(true)
.help("Specify Arguments to pass down to neovim"), .help("Specify Arguments to pass down to neovim"),
) )
// Command-line arguments only // Command-line arguments only
.arg( .arg(
Arg::with_name("geometry") Arg::new("geometry")
.long("geometry") .long("geometry")
.takes_value(true) .takes_value(true)
.help("Specify the Geometry of the window"), .help("Specify the Geometry of the window"),
) )
.arg( .arg(
Arg::with_name("log_to_file") Arg::new("log_to_file")
.long("log") .long("log")
.help("Log to a file"), .help("Log to a file"),
) )
.arg( .arg(
Arg::with_name("nofork") Arg::new("nofork")
.long("nofork") .long("nofork")
.help("Do not detach process from terminal"), .help("Do not detach process from terminal"),
) )
.arg( .arg(
Arg::with_name("remote_tcp") Arg::new("remote_tcp")
.long("remote-tcp") .long("remote-tcp")
.takes_value(true) .takes_value(true)
.help("Connect to Remote TCP"), .help("Connect to Remote TCP"),
) )
.arg( .arg(
Arg::with_name("wsl") Arg::new("wsl")
.long("wsl") .long("wsl")
.help("Run in WSL") .help("Run in WSL")
) )
// Command-line flags with environment variable fallback // Command-line flags with environment variable fallback
.arg( .arg(
Arg::with_name("frame") Arg::new("frame")
.long("frame") .long("frame")
.takes_value(true) .takes_value(true)
.help("Configure the window frame. NOTE: Window might not be resizable if setting is None.") .help("Configure the window frame. NOTE: Window might not be resizable if setting is None.")
) )
.arg( .arg(
Arg::with_name("maximized") Arg::new("maximized")
.long("maximized") .long("maximized")
.help("Maximize the window"), .help("Maximize the window"),
) )
.arg( .arg(
Arg::with_name("multi_grid") Arg::new("multi_grid")
.long("multigrid") .long("multigrid")
.help("Enable Multigrid"), .help("Enable Multigrid"),
) )
.arg( .arg(
Arg::with_name("noidle") Arg::new("noidle")
.long("noidle") .long("noidle")
.help("Render every frame. Takes more power and cpu time but possibly fixes animation issues"), .help("Render every frame. Takes more power and cpu time but possibly fixes animation issues"),
) )
.arg( .arg(
Arg::with_name("nosrgb") Arg::new("nosrgb")
.long("nosrgb") .long("nosrgb")
.help("Do not use standard color space to initialize the window. Swapping this variable sometimes fixes issues on startup"), .help("Do not use standard color space to initialize the window. Swapping this variable sometimes fixes issues on startup"),
) )
// Command-line arguments with environment variable fallback // Command-line arguments with environment variable fallback
.arg( .arg(
Arg::with_name("neovim_bin") Arg::new("neovim_bin")
.long("neovim-bin") .long("neovim-bin")
.takes_value(true) .takes_value(true)
.help("Specify path to neovim"), .help("Specify path to neovim"),
) )
.arg( .arg(
Arg::with_name("wayland_app_id") Arg::new("wayland_app_id")
.long("wayland-app-id") .long("wayland-app-id")
.takes_value(true) .takes_value(true)
.help("Specify an App ID for Wayland"), .help("Specify an App ID for Wayland"),
) )
.arg( .arg(
Arg::with_name("x11_wm_class") Arg::new("x11_wm_class")
.long("x11-wm-class") .long("x11-wm-class")
.takes_value(true) .takes_value(true)
.help("Specify an X11 WM class"), .help("Specify an X11 WM class"),

@ -34,7 +34,7 @@ extern crate lazy_static;
use std::env::args; use std::env::args;
#[cfg(not(test))] #[cfg(not(test))]
use flexi_logger::{Cleanup, Criterion, Duplicate, Logger, Naming}; use flexi_logger::{Cleanup, Criterion, Duplicate, FileSpec, Logger, Naming};
use log::trace; use log::trace;
use bridge::start_bridge; use bridge::start_bridge;
@ -150,8 +150,9 @@ pub fn init_logger() {
let settings = SETTINGS.get::<CmdLineSettings>(); let settings = SETTINGS.get::<CmdLineSettings>();
let logger = if settings.log_to_file { let logger = if settings.log_to_file {
Logger::with_env_or_str("neovide") Logger::try_with_env_or_str("neovide")
.log_to_file() .expect("Could not init logger")
.log_to_file(FileSpec::default())
.rotate( .rotate(
Criterion::Size(10_000_000), Criterion::Size(10_000_000),
Naming::Timestamps, Naming::Timestamps,
@ -159,7 +160,7 @@ pub fn init_logger() {
) )
.duplicate_to_stderr(Duplicate::Error) .duplicate_to_stderr(Duplicate::Error)
} else { } else {
Logger::with_env_or_str("neovide = error") Logger::try_with_env_or_str("neovide = error").expect("Cloud not init logger")
}; };
logger.start().expect("Could not start logger"); logger.start().expect("Could not start logger");

Loading…
Cancel
Save