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

Update vim configuration on save

Browse Source 
source configuration one Ok pressed
This commit is contained in:
daa
2017-11-04 23:04:03 +03:00
parent afa282833a
commit 5345d178bf
9 changed files with 113 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/shell.rs
View File

@@ -22,7 +22,6 @@ use ui_model::{UiModel, Attrs, ModelRect};
use color::{ColorModel, Color, COLOR_BLACK, COLOR_WHITE, COLOR_RED};
use nvim;
use nvim::{RedrawEvents, GuiApi, RepaintMode, ErrorReport, NeovimClient};
use nvim_config::NvimConfig;
use input;
use input::keyval_to_input_string;
use cursor::Cursor;
@@ -78,14 +77,13 @@ pub struct State {
resize_state: Rc<Cell<ResizeState>>,
options: ShellOptions,
nvim_config: NvimConfig,
detach_cb: Option<Box<RefCell<FnMut() + Send + 'static>>>,
nvim_started_cb: Option<Box<RefCell<FnMut() + Send + 'static>>>,
}
impl State {
pub fn new(settings: Rc<RefCell<Settings>>, options: ShellOptions, nvim_config: NvimConfig) -> State {
pub fn new(settings: Rc<RefCell<Settings>>, options: ShellOptions) -> State {
let drawing_area = gtk::DrawingArea::new();
let popup_menu = RefCell::new(PopupMenu::new(&drawing_area));
let font_ctx = render::Context::new(FontDescription::from_string(DEFAULT_FONT_NAME));
@@ -113,7 +111,6 @@ impl State {
resize_state: Rc::new(Cell::new(ResizeState::Wait)),
options,
nvim_config,
detach_cb: None,
nvim_started_cb: None,
@@ -393,9 +390,9 @@ pub struct Shell {
}
impl Shell {
pub fn new(settings: Rc<RefCell<Settings>>, options: ShellOptions, nvim_config: NvimConfig) -> Shell {
pub fn new(settings: Rc<RefCell<Settings>>, options: ShellOptions) -> Shell {
let shell = Shell {
state: Arc::new(UiMutex::new(State::new(settings, options, nvim_config))),
state: Arc::new(UiMutex::new(State::new(settings, options))),
ui_state: Rc::new(RefCell::new(UiState::new())),
widget: gtk::Box::new(gtk::Orientation::Vertical, 0),
@@ -768,12 +765,11 @@ fn show_nvim_init_error(err: &nvim::NvimInitError, state_arc: Arc<UiMutex<State>
fn init_nvim_async(
state_arc: Arc<UiMutex<State>>,
options: ShellOptions,
nvim_config: NvimConfig,
cols: usize,
rows: usize,
) {
// execute nvim
let mut nvim = match nvim::start(state_arc.clone(), options.nvim_bin_path.as_ref(), nvim_config) {
let mut nvim = match nvim::start(state_arc.clone(), options.nvim_bin_path.as_ref()) {
Ok(nvim) => nvim,
Err(err) => {
show_nvim_start_error(&err, state_arc);
@@ -868,8 +864,7 @@ fn init_nvim(state_ref: &Arc<UiMutex<State>>) {
let state_arc = state_ref.clone();
let options = state.options.clone();
let nvim_config = state.nvim_config.clone();
thread::spawn(move || init_nvim_async(state_arc, options, nvim_config, cols, rows));
thread::spawn(move || init_nvim_async(state_arc, options, cols, rows));
}
}