hasufell/neovim-gtk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

set termguicolors

Browse Source
This commit is contained in:
daa84 2017-05-15 17:44:37 +03:00
parent 48a16528a8
commit 9cf24e0950
3 changed files with 27 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Cargo.lock generated
View File

@ -13,7 +13,7 @@ dependencies = [
"gtk-sys 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", "gtk-sys 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
"htmlescape 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "htmlescape 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
"neovim-lib 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "neovim-lib 0.3.1 (git+https://github.com/daa84/neovim-lib)",
"pango 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "pango 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
"pangocairo 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "pangocairo 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"phf 0.7.21 (registry+https://github.com/rust-lang/crates.io-index)", "phf 0.7.21 (registry+https://github.com/rust-lang/crates.io-index)",
@ -293,8 +293,8 @@ dependencies = [
[[package]] [[package]]
name = "neovim-lib" name = "neovim-lib"
version = "0.3.0" version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "git+https://github.com/daa84/neovim-lib#043a9eb2b8054d38e0f99872a670b82e79ac2b1f"
dependencies = [ dependencies = [
"log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
"rmp 0.8.6 (registry+https://github.com/rust-lang/crates.io-index)", "rmp 0.8.6 (registry+https://github.com/rust-lang/crates.io-index)",
@ -583,7 +583,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
"checksum libc 0.2.22 (registry+https://github.com/rust-lang/crates.io-index)" = "babb8281da88cba992fa1f4ddec7d63ed96280a1a53ec9b919fd37b53d71e502" "checksum libc 0.2.22 (registry+https://github.com/rust-lang/crates.io-index)" = "babb8281da88cba992fa1f4ddec7d63ed96280a1a53ec9b919fd37b53d71e502"
"checksum log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "5141eca02775a762cc6cd564d8d2c50f67c0ea3a372cbf1c51592b3e029e10ad" "checksum log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "5141eca02775a762cc6cd564d8d2c50f67c0ea3a372cbf1c51592b3e029e10ad"
"checksum memchr 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1dbccc0e46f1ea47b9f17e6d67c5a96bd27030519c519c9c91327e31275a47b4" "checksum memchr 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1dbccc0e46f1ea47b9f17e6d67c5a96bd27030519c519c9c91327e31275a47b4"
"checksum neovim-lib 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4843620b15e99197ab5f12287df0226c41b9b080e8ef08850b2ad327dad7f5ca" "checksum neovim-lib 0.3.1 (git+https://github.com/daa84/neovim-lib)" = "<none>"
"checksum num-traits 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)" = "e1cbfa3781f3fe73dc05321bed52a06d2d491eaa764c52335cf4399f046ece99" "checksum num-traits 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)" = "e1cbfa3781f3fe73dc05321bed52a06d2d491eaa764c52335cf4399f046ece99"
"checksum pango 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "4215233226ff03c9a3ed7c85cbc3c58257203723e3a93d5a20ce3560f66261b7" "checksum pango 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "4215233226ff03c9a3ed7c85cbc3c58257203723e3a93d5a20ce3560f66261b7"
"checksum pango-sys 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "e401ee469540e60a80d1df63dcea4e9c201115e79344b77529fa3705ea8eadcd" "checksum pango-sys 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "e401ee469540e60a80d1df63dcea4e9c201115e79344b77529fa3705ea8eadcd"

6
Cargo.toml
View File

@ -12,7 +12,7 @@ glib = "0.1"
glib-sys = "0.3" glib-sys = "0.3"
gdk = "0.5" gdk = "0.5"
gdk-sys = "0.3" gdk-sys = "0.3"
neovim-lib = "0.3" #neovim-lib = "0.3"
phf = "0.7" phf = "0.7"
gio = "0.1" gio = "0.1"
log = "0.3" log = "0.3"
@ -23,8 +23,8 @@ serde = "1.0"
serde_derive = "1.0" serde_derive = "1.0"
toml = "0.4" toml = "0.4"
#[dependencies.neovim-lib] [dependencies.neovim-lib]
#git = "https://github.com/daa84/neovim-lib" git = "https://github.com/daa84/neovim-lib"
[build-dependencies] [build-dependencies]
phf_codegen = "0.7" phf_codegen = "0.7"

23
src/nvim.rs
View File

@ -1,4 +1,5 @@
use std::io::{Result, Error, ErrorKind}; use std::io::{Result, Error, ErrorKind};
use std::process::{Stdio, Command};
use std::result; use std::result;
use std::sync::Arc; use std::sync::Arc;
@ -71,16 +72,26 @@ pub fn initialize(shell: Arc<UiMutex<shell::State>>,
nvim_bin_path: Option<&String>, nvim_bin_path: Option<&String>,
external_popup: bool) external_popup: bool)
-> Result<Neovim> { -> Result<Neovim> {
let session = if let Some(path) = nvim_bin_path { let mut cmd = if let Some(path) = nvim_bin_path {
match Session::new_child_path(path) { Command::new(path)
} else {
Command::new("nvim")
};
cmd.arg("--embed")
.arg("--headless")
.arg("--cmd")
.arg("set termguicolors")
.stderr(Stdio::inherit());
let session = Session::new_child_cmd(&mut cmd);
let session = match session {
Err(e) => { Err(e) => {
println!("Error execute {}", path); println!("Error execute: {:?}", cmd);
return Err(From::from(e)); return Err(From::from(e));
} }
Ok(s) => s, Ok(s) => s,
}
} else {
Session::new_child()?
}; };
let mut nvim = Neovim::new(session); let mut nvim = Neovim::new(session);