nvim handler refactoring
This commit is contained in:
daa
parent
e7cd39607f
commit
d9af1b9477
687
src/nvim.rs
687
src/nvim.rs
|
|
@ -1,687 +0,0 @@
|
|||
use std::error;
|
||||
use std::fmt;
|
||||
use std::env;
|
||||
use std::process::{Stdio, Command};
|
||||
use std::result;
|
||||
use std::sync::Arc;
|
||||
use std::ops::{Deref, DerefMut};
|
||||
|
||||
use neovim_lib::{Handler, Neovim, NeovimApi, Session, Value, UiAttachOptions, CallError, UiOption};
|
||||
use neovim_lib::neovim_api::Tabpage;
|
||||
|
||||
use ui::UiMutex;
|
||||
use ui_model::{ModelRect, ModelRectVec};
|
||||
use shell;
|
||||
use glib;
|
||||
|
||||
use value::ValueMapExt;
|
||||
|
||||
pub trait RedrawEvents {
|
||||
fn on_cursor_goto(&mut self, row: u64, col: u64) -> RepaintMode;
|
||||
|
||||
fn on_put(&mut self, text: &str) -> RepaintMode;
|
||||
|
||||
fn on_clear(&mut self) -> RepaintMode;
|
||||
|
||||
fn on_resize(&mut self, columns: u64, rows: u64) -> RepaintMode;
|
||||
|
||||
fn on_redraw(&mut self, mode: &RepaintMode);
|
||||
|
||||
fn on_highlight_set(&mut self, attrs: &[(Value, Value)]) -> RepaintMode;
|
||||
|
||||
fn on_eol_clear(&mut self) -> RepaintMode;
|
||||
|
||||
fn on_set_scroll_region(&mut self, top: u64, bot: u64, left: u64, right: u64) -> RepaintMode;
|
||||
|
||||
fn on_scroll(&mut self, count: i64) -> RepaintMode;
|
||||
|
||||
fn on_update_bg(&mut self, bg: i64) -> RepaintMode;
|
||||
|
||||
fn on_update_fg(&mut self, fg: i64) -> RepaintMode;
|
||||
|
||||
fn on_update_sp(&mut self, sp: i64) -> RepaintMode;
|
||||
|
||||
fn on_mode_change(&mut self, mode: &str, idx: u64) -> RepaintMode;
|
||||
|
||||
fn on_mouse(&mut self, on: bool) -> RepaintMode;
|
||||
|
||||
fn on_busy(&mut self, busy: bool) -> RepaintMode;
|
||||
|
||||
fn popupmenu_show(
|
||||
&mut self,
|
||||
menu: &[Vec<&str>],
|
||||
selected: i64,
|
||||
row: u64,
|
||||
col: u64,
|
||||
) -> RepaintMode;
|
||||
|
||||
fn popupmenu_hide(&mut self) -> RepaintMode;
|
||||
|
||||
fn popupmenu_select(&mut self, selected: i64) -> RepaintMode;
|
||||
|
||||
fn tabline_update(
|
||||
&mut self,
|
||||
selected: Tabpage,
|
||||
tabs: Vec<(Tabpage, Option<String>)>,
|
||||
) -> RepaintMode;
|
||||
|
||||
fn mode_info_set(
|
||||
&mut self,
|
||||
cursor_style_enabled: bool,
|
||||
mode_info: Vec<ModeInfo>,
|
||||
) -> RepaintMode;
|
||||
}
|
||||
|
||||
pub trait GuiApi {
|
||||
fn set_font(&mut self, font_desc: &str);
|
||||
}
|
||||
|
||||
macro_rules! try_str {
|
||||
($exp:expr) => ($exp.as_str().ok_or_else(|| "Can't convert argument to string".to_owned())?)
|
||||
}
|
||||
|
||||
macro_rules! try_int {
|
||||
($expr:expr) => ($expr.as_i64().ok_or_else(|| "Can't convert argument to int".to_owned())?)
|
||||
}
|
||||
|
||||
macro_rules! try_uint {
|
||||
($exp:expr) => ($exp.as_u64().ok_or_else(|| "Can't convert argument to u64".to_owned())?)
|
||||
}
|
||||
|
||||
macro_rules! try_bool {
|
||||
($exp:expr) => ($exp.as_bool().ok_or_else(|| "Can't convert argument to bool".to_owned())?)
|
||||
}
|
||||
|
||||
macro_rules! map_array {
|
||||
($arg:expr, $err:expr, |$item:ident| $exp:expr) => (
|
||||
$arg.as_array()
|
||||
.ok_or_else(|| $err)
|
||||
.and_then(|items| items.iter().map(|$item| {
|
||||
$exp
|
||||
}).collect::<Result<Vec<_>, _>>())
|
||||
);
|
||||
($arg:expr, $err:expr, |$item:ident| {$exp:expr}) => (
|
||||
$arg.as_array()
|
||||
.ok_or_else(|| $err)
|
||||
.and_then(|items| items.iter().map(|$item| {
|
||||
$exp
|
||||
}).collect::<Result<Vec<_>, _>>())
|
||||
);
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone)]
|
||||
pub enum CursorShape {
|
||||
Block,
|
||||
Horizontal,
|
||||
Vertical,
|
||||
Unknown,
|
||||
}
|
||||
|
||||
impl CursorShape {
|
||||
fn new(shape_code: &Value) -> Result<CursorShape, String> {
|
||||
let str_code = shape_code.as_str().ok_or_else(|| {
|
||||
"Can't convert cursor shape to string".to_owned()
|
||||
})?;
|
||||
|
||||
Ok(match str_code {
|
||||
"block" => CursorShape::Block,
|
||||
"horizontal" => CursorShape::Horizontal,
|
||||
"vertical" => CursorShape::Vertical,
|
||||
_ => {
|
||||
error!("Unknown cursor_shape {}", str_code);
|
||||
CursorShape::Unknown
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone)]
|
||||
pub struct ModeInfo {
|
||||
cursor_shape: Option<CursorShape>,
|
||||
cell_percentage: Option<u64>,
|
||||
}
|
||||
|
||||
impl ModeInfo {
|
||||
pub fn new(mode_info_arr: &Vec<(Value, Value)>) -> Result<Self, String> {
|
||||
let mode_info_map = mode_info_arr.to_attrs_map()?;
|
||||
|
||||
let cursor_shape = if let Some(shape) = mode_info_map.get("cursor_shape") {
|
||||
Some(CursorShape::new(shape)?)
|
||||
} else {
|
||||
None
|
||||
};
|
||||
|
||||
let cell_percentage = if let Some(cell_percentage) = mode_info_map.get("cell_percentage") {
|
||||
cell_percentage.as_u64()
|
||||
} else {
|
||||
None
|
||||
};
|
||||
|
||||
Ok(ModeInfo {
|
||||
cursor_shape,
|
||||
cell_percentage,
|
||||
})
|
||||
}
|
||||
|
||||
pub fn cursor_shape(&self) -> Option<&CursorShape> {
|
||||
self.cursor_shape.as_ref()
|
||||
}
|
||||
|
||||
pub fn cell_percentage(&self) -> u64 {
|
||||
self.cell_percentage.unwrap_or(0)
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Debug)]
|
||||
pub struct NvimInitError {
|
||||
source: Box<error::Error>,
|
||||
cmd: Option<String>,
|
||||
}
|
||||
|
||||
impl NvimInitError {
|
||||
pub fn new_post_init<E>(error: E) -> NvimInitError
|
||||
where
|
||||
E: Into<Box<error::Error>>,
|
||||
{
|
||||
NvimInitError {
|
||||
cmd: None,
|
||||
source: error.into(),
|
||||
}
|
||||
}
|
||||
|
||||
pub fn new<E>(cmd: &Command, error: E) -> NvimInitError
|
||||
where
|
||||
E: Into<Box<error::Error>>,
|
||||
{
|
||||
NvimInitError {
|
||||
cmd: Some(format!("{:?}", cmd)),
|
||||
source: error.into(),
|
||||
}
|
||||
}
|
||||
|
||||
pub fn source(&self) -> String {
|
||||
format!("{}", self.source)
|
||||
}
|
||||
|
||||
pub fn cmd(&self) -> Option<&String> {
|
||||
self.cmd.as_ref()
|
||||
}
|
||||
}
|
||||
|
||||
impl fmt::Display for NvimInitError {
|
||||
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
|
||||
write!(f, "{:?}", self.source)
|
||||
}
|
||||
}
|
||||
|
||||
impl error::Error for NvimInitError {
|
||||
fn description(&self) -> &str {
|
||||
"Can't start nvim instance"
|
||||
}
|
||||
|
||||
fn cause(&self) -> Option<&error::Error> {
|
||||
Some(&*self.source)
|
||||
}
|
||||
}
|
||||
|
||||
pub fn start(
|
||||
shell: Arc<UiMutex<shell::State>>,
|
||||
nvim_bin_path: Option<&String>,
|
||||
) -> result::Result<Neovim, NvimInitError> {
|
||||
let mut cmd = if let Some(path) = nvim_bin_path {
|
||||
Command::new(path)
|
||||
} else {
|
||||
Command::new("nvim")
|
||||
};
|
||||
|
||||
cmd.arg("--embed")
|
||||
.arg("--headless")
|
||||
// Swap files are disabled because it shows message window on start up but frontend can't detect it.
|
||||
.arg("-n")
|
||||
.arg("--cmd")
|
||||
.arg("set termguicolors")
|
||||
.arg("--cmd")
|
||||
.arg("let g:GtkGuiLoaded = 1")
|
||||
.stderr(Stdio::inherit());
|
||||
|
||||
if let Ok(runtime_path) = env::var("NVIM_GTK_RUNTIME_PATH") {
|
||||
cmd.arg("--cmd").arg(
|
||||
format!("let &rtp.=',{}'", runtime_path),
|
||||
);
|
||||
} else if let Some(prefix) = option_env!("PREFIX") {
|
||||
cmd.arg("--cmd").arg(format!(
|
||||
"let &rtp.=',{}/share/nvim-gtk/runtime'",
|
||||
prefix
|
||||
));
|
||||
} else {
|
||||
cmd.arg("--cmd").arg("let &rtp.=',runtime'");
|
||||
}
|
||||
|
||||
let session = Session::new_child_cmd(&mut cmd);
|
||||
|
||||
let session = match session {
|
||||
Err(e) => return Err(NvimInitError::new(&cmd, e)),
|
||||
Ok(s) => s,
|
||||
};
|
||||
|
||||
let mut nvim = Neovim::new(session);
|
||||
|
||||
nvim.session.start_event_loop_handler(
|
||||
NvimHandler::new(shell),
|
||||
);
|
||||
|
||||
Ok(nvim)
|
||||
}
|
||||
|
||||
pub fn post_start_init(
|
||||
nvim: &mut Neovim,
|
||||
open_path: Option<&String>,
|
||||
cols: u64,
|
||||
rows: u64,
|
||||
) -> result::Result<(), NvimInitError> {
|
||||
let mut opts = UiAttachOptions::new();
|
||||
opts.set_popupmenu_external(false);
|
||||
opts.set_tabline_external(true);
|
||||
nvim.ui_attach(cols, rows, opts).map_err(
|
||||
NvimInitError::new_post_init,
|
||||
)?;
|
||||
nvim.command("runtime! ginit.vim").map_err(
|
||||
NvimInitError::new_post_init,
|
||||
)?;
|
||||
|
||||
if let Some(path) = open_path {
|
||||
nvim.command(&format!("e {}", path)).map_err(
|
||||
NvimInitError::new_post_init,
|
||||
)?;
|
||||
}
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
pub struct NvimHandler {
|
||||
shell: Arc<UiMutex<shell::State>>,
|
||||
}
|
||||
|
||||
impl NvimHandler {
|
||||
pub fn new(shell: Arc<UiMutex<shell::State>>) -> NvimHandler {
|
||||
NvimHandler { shell: shell }
|
||||
}
|
||||
|
||||
fn nvim_cb(&self, method: &str, params: Vec<Value>) {
|
||||
match method {
|
||||
"redraw" => {
|
||||
self.safe_call(move |ui| {
|
||||
let mut repaint_mode = RepaintMode::Nothing;
|
||||
|
||||
for ev in ¶ms {
|
||||
if let Some(ev_args) = ev.as_array() {
|
||||
if let Some(ev_name) = ev_args[0].as_str() {
|
||||
for local_args in ev_args.iter().skip(1) {
|
||||
let args = match *local_args {
|
||||
Value::Array(ref ar) => ar.clone(),
|
||||
_ => vec![],
|
||||
};
|
||||
let call_reapint_mode = call(ui, ev_name, &args)?;
|
||||
repaint_mode = repaint_mode.join(call_reapint_mode);
|
||||
}
|
||||
} else {
|
||||
println!("Unsupported event {:?}", ev_args);
|
||||
}
|
||||
} else {
|
||||
println!("Unsupported event type {:?}", ev);
|
||||
}
|
||||
}
|
||||
|
||||
ui.on_redraw(&repaint_mode);
|
||||
Ok(())
|
||||
});
|
||||
}
|
||||
"Gui" => {
|
||||
if !params.is_empty() {
|
||||
if let Some(ev_name) = params[0].as_str().map(String::from) {
|
||||
let args = params.iter().skip(1).cloned().collect();
|
||||
self.safe_call(move |ui| {
|
||||
call_gui_event(ui, &ev_name, &args)?;
|
||||
ui.on_redraw(&RepaintMode::All);
|
||||
Ok(())
|
||||
});
|
||||
} else {
|
||||
println!("Unsupported event {:?}", params);
|
||||
}
|
||||
} else {
|
||||
println!("Unsupported event {:?}", params);
|
||||
}
|
||||
}
|
||||
_ => {
|
||||
println!("Notification {}({:?})", method, params);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fn safe_call<F>(&self, cb: F)
|
||||
where
|
||||
F: Fn(&mut shell::State) -> result::Result<(), String> + 'static + Send,
|
||||
{
|
||||
let shell = self.shell.clone();
|
||||
glib::idle_add(move || {
|
||||
if let Err(msg) = cb(&mut shell.borrow_mut()) {
|
||||
println!("Error call function: {}", msg);
|
||||
}
|
||||
glib::Continue(false)
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
impl Handler for NvimHandler {
|
||||
fn handle_notify(&mut self, name: &str, args: &Vec<Value>) {
|
||||
self.nvim_cb(name, args.clone());
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
fn call_gui_event(
|
||||
ui: &mut shell::State,
|
||||
method: &str,
|
||||
args: &Vec<Value>,
|
||||
) -> result::Result<(), String> {
|
||||
match method {
|
||||
"Font" => ui.set_font(try_str!(args[0])),
|
||||
"Option" => {
|
||||
match try_str!(args[0]) {
|
||||
"Popupmenu" => {
|
||||
ui.nvim()
|
||||
.ok_or_else(|| "Nvim not initialized".to_owned())
|
||||
.and_then(|mut nvim| {
|
||||
nvim.set_option(UiOption::ExtPopupmenu(try_uint!(args[1]) == 1))
|
||||
.map_err(|e| e.to_string())
|
||||
})?
|
||||
}
|
||||
"Tabline" => {
|
||||
ui.nvim()
|
||||
.ok_or_else(|| "Nvim not initialized".to_owned())
|
||||
.and_then(|mut nvim| {
|
||||
nvim.set_option(UiOption::ExtTabline(try_uint!(args[1]) == 1))
|
||||
.map_err(|e| e.to_string())
|
||||
})?
|
||||
}
|
||||
opt => error!("Unknown option {}", opt),
|
||||
}
|
||||
}
|
||||
_ => return Err(format!("Unsupported event {}({:?})", method, args)),
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn call(
|
||||
ui: &mut shell::State,
|
||||
method: &str,
|
||||
args: &[Value],
|
||||
) -> result::Result<RepaintMode, String> {
|
||||
let repaint_mode = match method {
|
||||
"cursor_goto" => ui.on_cursor_goto(try_uint!(args[0]), try_uint!(args[1])),
|
||||
"put" => ui.on_put(try_str!(args[0])),
|
||||
"clear" => ui.on_clear(),
|
||||
"resize" => ui.on_resize(try_uint!(args[0]), try_uint!(args[1])),
|
||||
"highlight_set" => {
|
||||
if let Value::Map(ref attrs) = args[0] {
|
||||
ui.on_highlight_set(attrs);
|
||||
} else {
|
||||
panic!("Supports only map value as argument");
|
||||
}
|
||||
RepaintMode::Nothing
|
||||
}
|
||||
"eol_clear" => ui.on_eol_clear(),
|
||||
"set_scroll_region" => {
|
||||
ui.on_set_scroll_region(
|
||||
try_uint!(args[0]),
|
||||
try_uint!(args[1]),
|
||||
try_uint!(args[2]),
|
||||
try_uint!(args[3]),
|
||||
);
|
||||
RepaintMode::Nothing
|
||||
}
|
||||
"scroll" => ui.on_scroll(try_int!(args[0])),
|
||||
"update_bg" => ui.on_update_bg(try_int!(args[0])),
|
||||
"update_fg" => ui.on_update_fg(try_int!(args[0])),
|
||||
"update_sp" => ui.on_update_sp(try_int!(args[0])),
|
||||
"mode_change" => ui.on_mode_change(try_str!(args[0]), try_uint!(args[1])),
|
||||
"mouse_on" => ui.on_mouse(true),
|
||||
"mouse_off" => ui.on_mouse(false),
|
||||
"busy_start" => ui.on_busy(true),
|
||||
"busy_stop" => ui.on_busy(false),
|
||||
"popupmenu_show" => {
|
||||
let menu_items = map_array!(args[0], "Error get menu list array", |item| {
|
||||
map_array!(item, "Error get menu item array", |col| {
|
||||
col.as_str().ok_or("Error get menu column")
|
||||
})
|
||||
})?;
|
||||
|
||||
ui.popupmenu_show(
|
||||
&menu_items,
|
||||
try_int!(args[1]),
|
||||
try_uint!(args[2]),
|
||||
try_uint!(args[3]),
|
||||
)
|
||||
}
|
||||
"popupmenu_hide" => ui.popupmenu_hide(),
|
||||
"popupmenu_select" => ui.popupmenu_select(try_int!(args[0])),
|
||||
"tabline_update" => {
|
||||
let tabs_out = map_array!(args[1], "Error get tabline list".to_owned(), |tab| {
|
||||
tab.as_map()
|
||||
.ok_or_else(|| "Error get map for tab".to_owned())
|
||||
.and_then(|tab_map| tab_map.to_attrs_map())
|
||||
.map(|tab_attrs| {
|
||||
let name_attr = tab_attrs.get("name").and_then(
|
||||
|n| n.as_str().map(|s| s.to_owned()),
|
||||
);
|
||||
let tab_attr = tab_attrs
|
||||
.get("tab")
|
||||
.map(|tab_id| Tabpage::new(tab_id.clone()))
|
||||
.unwrap();
|
||||
|
||||
(tab_attr, name_attr)
|
||||
})
|
||||
})?;
|
||||
ui.tabline_update(Tabpage::new(args[0].clone()), tabs_out)
|
||||
}
|
||||
"mode_info_set" => {
|
||||
let mode_info = map_array!(
|
||||
args[1],
|
||||
"Error get array key value for mode_info".to_owned(),
|
||||
|mi| {
|
||||
mi.as_map()
|
||||
.ok_or_else(|| "Erro get map for mode_info".to_owned())
|
||||
.and_then(|mi_map| ModeInfo::new(mi_map))
|
||||
}
|
||||
)?;
|
||||
ui.mode_info_set(try_bool!(args[0]), mode_info)
|
||||
}
|
||||
_ => {
|
||||
println!("Event {}({:?})", method, args);
|
||||
RepaintMode::Nothing
|
||||
}
|
||||
};
|
||||
|
||||
Ok(repaint_mode)
|
||||
}
|
||||
|
||||
pub trait ErrorReport {
|
||||
fn report_err(&self, nvim: &mut NeovimApi);
|
||||
}
|
||||
|
||||
impl<T> ErrorReport for result::Result<T, CallError> {
|
||||
fn report_err(&self, _: &mut NeovimApi) {
|
||||
if let Err(ref err) = *self {
|
||||
println!("{}", err);
|
||||
//nvim.report_error(&err_msg).expect("Error report error :)");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Clone, Debug)]
|
||||
pub enum RepaintMode {
|
||||
Nothing,
|
||||
All,
|
||||
AreaList(ModelRectVec),
|
||||
Area(ModelRect),
|
||||
}
|
||||
|
||||
impl RepaintMode {
|
||||
pub fn join(self, mode: RepaintMode) -> RepaintMode {
|
||||
match (self, mode) {
|
||||
(RepaintMode::Nothing, m) => m,
|
||||
(m, RepaintMode::Nothing) => m,
|
||||
(RepaintMode::All, _) => RepaintMode::All,
|
||||
(_, RepaintMode::All) => RepaintMode::All,
|
||||
(RepaintMode::Area(mr1), RepaintMode::Area(mr2)) => {
|
||||
let mut vec = ModelRectVec::new(mr1);
|
||||
vec.join(&mr2);
|
||||
RepaintMode::AreaList(vec)
|
||||
}
|
||||
(RepaintMode::AreaList(mut target), RepaintMode::AreaList(source)) => {
|
||||
for s in &source.list {
|
||||
target.join(s);
|
||||
}
|
||||
RepaintMode::AreaList(target)
|
||||
}
|
||||
(RepaintMode::AreaList(mut list), RepaintMode::Area(l2)) => {
|
||||
list.join(&l2);
|
||||
RepaintMode::AreaList(list)
|
||||
}
|
||||
(RepaintMode::Area(l1), RepaintMode::AreaList(mut list)) => {
|
||||
list.join(&l1);
|
||||
RepaintMode::AreaList(list)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
enum NeovimClientState {
|
||||
Uninitialized,
|
||||
InitInProgress,
|
||||
Initialized(Neovim),
|
||||
Error,
|
||||
}
|
||||
|
||||
impl NeovimClientState {
|
||||
pub fn is_initializing(&self) -> bool {
|
||||
match *self {
|
||||
NeovimClientState::InitInProgress => true,
|
||||
_ => false,
|
||||
}
|
||||
}
|
||||
|
||||
pub fn is_uninitialized(&self) -> bool {
|
||||
match *self {
|
||||
NeovimClientState::Uninitialized => true,
|
||||
_ => false,
|
||||
}
|
||||
}
|
||||
|
||||
pub fn is_initialized(&self) -> bool {
|
||||
match *self {
|
||||
NeovimClientState::Initialized(_) => true,
|
||||
_ => false,
|
||||
}
|
||||
}
|
||||
|
||||
pub fn nvim(&self) -> &Neovim {
|
||||
match *self {
|
||||
NeovimClientState::Initialized(ref nvim) => nvim,
|
||||
NeovimClientState::InitInProgress |
|
||||
NeovimClientState::Uninitialized => panic!("Access to uninitialized neovim client"),
|
||||
NeovimClientState::Error => {
|
||||
panic!("Access to neovim client that is not started due to some error")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pub fn nvim_mut(&mut self) -> &mut Neovim {
|
||||
match *self {
|
||||
NeovimClientState::Initialized(ref mut nvim) => nvim,
|
||||
NeovimClientState::InitInProgress |
|
||||
NeovimClientState::Uninitialized => panic!("Access to uninitialized neovim client"),
|
||||
NeovimClientState::Error => {
|
||||
panic!("Access to neovim client that is not started due to some error")
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pub struct NeovimClient {
|
||||
state: NeovimClientState,
|
||||
}
|
||||
|
||||
impl NeovimClient {
|
||||
pub fn new() -> Self {
|
||||
NeovimClient { state: NeovimClientState::Uninitialized }
|
||||
}
|
||||
|
||||
pub fn set_initialized(&mut self, nvim: Neovim) {
|
||||
self.state = NeovimClientState::Initialized(nvim);
|
||||
}
|
||||
|
||||
pub fn set_error(&mut self) {
|
||||
self.state = NeovimClientState::Error;
|
||||
}
|
||||
|
||||
pub fn set_in_progress(&mut self) {
|
||||
self.state = NeovimClientState::InitInProgress;
|
||||
}
|
||||
|
||||
pub fn is_initialized(&self) -> bool {
|
||||
self.state.is_initialized()
|
||||
}
|
||||
|
||||
pub fn is_uninitialized(&self) -> bool {
|
||||
self.state.is_uninitialized()
|
||||
}
|
||||
|
||||
pub fn is_initializing(&self) -> bool {
|
||||
self.state.is_initializing()
|
||||
}
|
||||
|
||||
pub fn nvim(&self) -> &Neovim {
|
||||
self.state.nvim()
|
||||
}
|
||||
|
||||
pub fn nvim_mut(&mut self) -> &mut Neovim {
|
||||
self.state.nvim_mut()
|
||||
}
|
||||
}
|
||||
|
||||
impl Deref for NeovimClient {
|
||||
type Target = Neovim;
|
||||
|
||||
fn deref(&self) -> &Neovim {
|
||||
self.nvim()
|
||||
}
|
||||
}
|
||||
|
||||
impl DerefMut for NeovimClient {
|
||||
fn deref_mut(&mut self) -> &mut Neovim {
|
||||
self.nvim_mut()
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
||||
#[test]
|
||||
fn test_mode() {
|
||||
let mode = RepaintMode::Area(ModelRect::point(1, 1));
|
||||
let mode = mode.join(RepaintMode::Nothing);
|
||||
|
||||
match mode {
|
||||
RepaintMode::Area(ref rect) => {
|
||||
assert_eq!(1, rect.top);
|
||||
assert_eq!(1, rect.bot);
|
||||
assert_eq!(1, rect.left);
|
||||
assert_eq!(1, rect.right);
|
||||
}
|
||||
_ => panic!("mode is worng"),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,112 @@
|
|||
use std::ops::{Deref, DerefMut};
|
||||
|
||||
use neovim_lib::Neovim;
|
||||
|
||||
enum NeovimClientState {
|
||||
Uninitialized,
|
||||
InitInProgress,
|
||||
Initialized(Neovim),
|
||||
Error,
|
||||
}
|
||||
|
||||
impl NeovimClientState {
|
||||
pub fn is_initializing(&self) -> bool {
|
||||
match *self {
|
||||
NeovimClientState::InitInProgress => true,
|
||||
_ => false,
|
||||
}
|
||||
}
|
||||
|
||||
pub fn is_uninitialized(&self) -> bool {
|
||||
match *self {
|
||||
NeovimClientState::Uninitialized => true,
|
||||
_ => false,
|
||||
}
|
||||
}
|
||||
|
||||
pub fn is_initialized(&self) -> bool {
|
||||
match *self {
|
||||
NeovimClientState::Initialized(_) => true,
|
||||
_ => false,
|
||||
}
|
||||
}
|
||||
|
||||
pub fn nvim(&self) -> &Neovim {
|
||||
match *self {
|
||||
NeovimClientState::Initialized(ref nvim) => nvim,
|
||||
NeovimClientState::InitInProgress |
|
||||
NeovimClientState::Uninitialized => panic!("Access to uninitialized neovim client"),
|
||||
NeovimClientState::Error => {
|
||||
panic!("Access to neovim client that is not started due to some error")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pub fn nvim_mut(&mut self) -> &mut Neovim {
|
||||
match *self {
|
||||
NeovimClientState::Initialized(ref mut nvim) => nvim,
|
||||
NeovimClientState::InitInProgress |
|
||||
NeovimClientState::Uninitialized => panic!("Access to uninitialized neovim client"),
|
||||
NeovimClientState::Error => {
|
||||
panic!("Access to neovim client that is not started due to some error")
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pub struct NeovimClient {
|
||||
state: NeovimClientState,
|
||||
}
|
||||
|
||||
impl NeovimClient {
|
||||
pub fn new() -> Self {
|
||||
NeovimClient { state: NeovimClientState::Uninitialized }
|
||||
}
|
||||
|
||||
pub fn set_initialized(&mut self, nvim: Neovim) {
|
||||
self.state = NeovimClientState::Initialized(nvim);
|
||||
}
|
||||
|
||||
pub fn set_error(&mut self) {
|
||||
self.state = NeovimClientState::Error;
|
||||
}
|
||||
|
||||
pub fn set_in_progress(&mut self) {
|
||||
self.state = NeovimClientState::InitInProgress;
|
||||
}
|
||||
|
||||
pub fn is_initialized(&self) -> bool {
|
||||
self.state.is_initialized()
|
||||
}
|
||||
|
||||
pub fn is_uninitialized(&self) -> bool {
|
||||
self.state.is_uninitialized()
|
||||
}
|
||||
|
||||
pub fn is_initializing(&self) -> bool {
|
||||
self.state.is_initializing()
|
||||
}
|
||||
|
||||
pub fn nvim(&self) -> &Neovim {
|
||||
self.state.nvim()
|
||||
}
|
||||
|
||||
pub fn nvim_mut(&mut self) -> &mut Neovim {
|
||||
self.state.nvim_mut()
|
||||
}
|
||||
}
|
||||
|
||||
impl Deref for NeovimClient {
|
||||
type Target = Neovim;
|
||||
|
||||
fn deref(&self) -> &Neovim {
|
||||
self.nvim()
|
||||
}
|
||||
}
|
||||
|
||||
impl DerefMut for NeovimClient {
|
||||
fn deref_mut(&mut self) -> &mut Neovim {
|
||||
self.nvim_mut()
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,93 @@
|
|||
use std::result;
|
||||
use std::sync::Arc;
|
||||
|
||||
use neovim_lib::{Handler, Value};
|
||||
|
||||
use ui::UiMutex;
|
||||
use shell;
|
||||
use glib;
|
||||
|
||||
use super::repaint_mode::RepaintMode;
|
||||
use super::redraw_handler;
|
||||
use super::redraw_handler::RedrawEvents;
|
||||
|
||||
pub struct NvimHandler {
|
||||
shell: Arc<UiMutex<shell::State>>,
|
||||
}
|
||||
|
||||
impl NvimHandler {
|
||||
pub fn new(shell: Arc<UiMutex<shell::State>>) -> NvimHandler {
|
||||
NvimHandler { shell: shell }
|
||||
}
|
||||
|
||||
fn nvim_cb(&self, method: &str, params: Vec<Value>) {
|
||||
match method {
|
||||
"redraw" => {
|
||||
self.safe_call(move |ui| {
|
||||
let mut repaint_mode = RepaintMode::Nothing;
|
||||
|
||||
for ev in ¶ms {
|
||||
if let Some(ev_args) = ev.as_array() {
|
||||
if let Some(ev_name) = ev_args[0].as_str() {
|
||||
for local_args in ev_args.iter().skip(1) {
|
||||
let args = match *local_args {
|
||||
Value::Array(ref ar) => ar.clone(),
|
||||
_ => vec![],
|
||||
};
|
||||
let call_reapint_mode = redraw_handler::call(ui, ev_name, &args)?;
|
||||
repaint_mode = repaint_mode.join(call_reapint_mode);
|
||||
}
|
||||
} else {
|
||||
println!("Unsupported event {:?}", ev_args);
|
||||
}
|
||||
} else {
|
||||
println!("Unsupported event type {:?}", ev);
|
||||
}
|
||||
}
|
||||
|
||||
ui.on_redraw(&repaint_mode);
|
||||
Ok(())
|
||||
});
|
||||
}
|
||||
"Gui" => {
|
||||
if !params.is_empty() {
|
||||
if let Some(ev_name) = params[0].as_str().map(String::from) {
|
||||
let args = params.iter().skip(1).cloned().collect();
|
||||
self.safe_call(move |ui| {
|
||||
redraw_handler::call_gui_event(ui, &ev_name, &args)?;
|
||||
ui.on_redraw(&RepaintMode::All);
|
||||
Ok(())
|
||||
});
|
||||
} else {
|
||||
println!("Unsupported event {:?}", params);
|
||||
}
|
||||
} else {
|
||||
println!("Unsupported event {:?}", params);
|
||||
}
|
||||
}
|
||||
_ => {
|
||||
println!("Notification {}({:?})", method, params);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fn safe_call<F>(&self, cb: F)
|
||||
where
|
||||
F: Fn(&mut shell::State) -> result::Result<(), String> + 'static + Send,
|
||||
{
|
||||
let shell = self.shell.clone();
|
||||
glib::idle_add(move || {
|
||||
if let Err(msg) = cb(&mut shell.borrow_mut()) {
|
||||
println!("Error call function: {}", msg);
|
||||
}
|
||||
glib::Continue(false)
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
impl Handler for NvimHandler {
|
||||
fn handle_notify(&mut self, name: &str, args: &Vec<Value>) {
|
||||
self.nvim_cb(name, args.clone());
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,164 @@
|
|||
|
||||
mod client;
|
||||
mod handler;
|
||||
mod mode_info;
|
||||
mod redraw_handler;
|
||||
mod repaint_mode;
|
||||
|
||||
pub use self::redraw_handler::{RedrawEvents, GuiApi};
|
||||
pub use self::repaint_mode::RepaintMode;
|
||||
pub use self::client::NeovimClient;
|
||||
pub use self::mode_info::{ModeInfo, CursorShape};
|
||||
|
||||
use std::error;
|
||||
use std::fmt;
|
||||
use std::env;
|
||||
use std::process::{Stdio, Command};
|
||||
use std::result;
|
||||
use std::sync::Arc;
|
||||
|
||||
use neovim_lib::{Neovim, NeovimApi, Session, UiAttachOptions, CallError};
|
||||
|
||||
use ui::UiMutex;
|
||||
use shell;
|
||||
|
||||
#[derive(Debug)]
|
||||
pub struct NvimInitError {
|
||||
source: Box<error::Error>,
|
||||
cmd: Option<String>,
|
||||
}
|
||||
|
||||
impl NvimInitError {
|
||||
pub fn new_post_init<E>(error: E) -> NvimInitError
|
||||
where
|
||||
E: Into<Box<error::Error>>,
|
||||
{
|
||||
NvimInitError {
|
||||
cmd: None,
|
||||
source: error.into(),
|
||||
}
|
||||
}
|
||||
|
||||
pub fn new<E>(cmd: &Command, error: E) -> NvimInitError
|
||||
where
|
||||
E: Into<Box<error::Error>>,
|
||||
{
|
||||
NvimInitError {
|
||||
cmd: Some(format!("{:?}", cmd)),
|
||||
source: error.into(),
|
||||
}
|
||||
}
|
||||
|
||||
pub fn source(&self) -> String {
|
||||
format!("{}", self.source)
|
||||
}
|
||||
|
||||
pub fn cmd(&self) -> Option<&String> {
|
||||
self.cmd.as_ref()
|
||||
}
|
||||
}
|
||||
|
||||
impl fmt::Display for NvimInitError {
|
||||
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
|
||||
write!(f, "{:?}", self.source)
|
||||
}
|
||||
}
|
||||
|
||||
impl error::Error for NvimInitError {
|
||||
fn description(&self) -> &str {
|
||||
"Can't start nvim instance"
|
||||
}
|
||||
|
||||
fn cause(&self) -> Option<&error::Error> {
|
||||
Some(&*self.source)
|
||||
}
|
||||
}
|
||||
|
||||
pub fn start(
|
||||
shell: Arc<UiMutex<shell::State>>,
|
||||
nvim_bin_path: Option<&String>,
|
||||
) -> result::Result<Neovim, NvimInitError> {
|
||||
let mut cmd = if let Some(path) = nvim_bin_path {
|
||||
Command::new(path)
|
||||
} else {
|
||||
Command::new("nvim")
|
||||
};
|
||||
|
||||
cmd.arg("--embed")
|
||||
.arg("--headless")
|
||||
// Swap files are disabled because it shows message window on start up but frontend can't detect it.
|
||||
.arg("-n")
|
||||
.arg("--cmd")
|
||||
.arg("set termguicolors")
|
||||
.arg("--cmd")
|
||||
.arg("let g:GtkGuiLoaded = 1")
|
||||
.stderr(Stdio::inherit());
|
||||
|
||||
if let Ok(runtime_path) = env::var("NVIM_GTK_RUNTIME_PATH") {
|
||||
cmd.arg("--cmd").arg(
|
||||
format!("let &rtp.=',{}'", runtime_path),
|
||||
);
|
||||
} else if let Some(prefix) = option_env!("PREFIX") {
|
||||
cmd.arg("--cmd").arg(format!(
|
||||
"let &rtp.=',{}/share/nvim-gtk/runtime'",
|
||||
prefix
|
||||
));
|
||||
} else {
|
||||
cmd.arg("--cmd").arg("let &rtp.=',runtime'");
|
||||
}
|
||||
|
||||
let session = Session::new_child_cmd(&mut cmd);
|
||||
|
||||
let session = match session {
|
||||
Err(e) => return Err(NvimInitError::new(&cmd, e)),
|
||||
Ok(s) => s,
|
||||
};
|
||||
|
||||
let mut nvim = Neovim::new(session);
|
||||
|
||||
nvim.session.start_event_loop_handler(
|
||||
handler::NvimHandler::new(shell),
|
||||
);
|
||||
|
||||
Ok(nvim)
|
||||
}
|
||||
|
||||
pub fn post_start_init(
|
||||
nvim: &mut Neovim,
|
||||
open_path: Option<&String>,
|
||||
cols: u64,
|
||||
rows: u64,
|
||||
) -> result::Result<(), NvimInitError> {
|
||||
let mut opts = UiAttachOptions::new();
|
||||
opts.set_popupmenu_external(false);
|
||||
opts.set_tabline_external(true);
|
||||
nvim.ui_attach(cols, rows, opts).map_err(
|
||||
NvimInitError::new_post_init,
|
||||
)?;
|
||||
nvim.command("runtime! ginit.vim").map_err(
|
||||
NvimInitError::new_post_init,
|
||||
)?;
|
||||
|
||||
if let Some(path) = open_path {
|
||||
nvim.command(&format!("e {}", path)).map_err(
|
||||
NvimInitError::new_post_init,
|
||||
)?;
|
||||
}
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
|
||||
pub trait ErrorReport {
|
||||
fn report_err(&self, nvim: &mut NeovimApi);
|
||||
}
|
||||
|
||||
impl<T> ErrorReport for result::Result<T, CallError> {
|
||||
fn report_err(&self, _: &mut NeovimApi) {
|
||||
if let Err(ref err) = *self {
|
||||
println!("{}", err);
|
||||
//nvim.report_error(&err_msg).expect("Error report error :)");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,66 @@
|
|||
use neovim_lib::Value;
|
||||
|
||||
use value::ValueMapExt;
|
||||
|
||||
#[derive(Debug, Clone)]
|
||||
pub enum CursorShape {
|
||||
Block,
|
||||
Horizontal,
|
||||
Vertical,
|
||||
Unknown,
|
||||
}
|
||||
|
||||
impl CursorShape {
|
||||
fn new(shape_code: &Value) -> Result<CursorShape, String> {
|
||||
let str_code = shape_code.as_str().ok_or_else(|| {
|
||||
"Can't convert cursor shape to string".to_owned()
|
||||
})?;
|
||||
|
||||
Ok(match str_code {
|
||||
"block" => CursorShape::Block,
|
||||
"horizontal" => CursorShape::Horizontal,
|
||||
"vertical" => CursorShape::Vertical,
|
||||
_ => {
|
||||
error!("Unknown cursor_shape {}", str_code);
|
||||
CursorShape::Unknown
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone)]
|
||||
pub struct ModeInfo {
|
||||
cursor_shape: Option<CursorShape>,
|
||||
cell_percentage: Option<u64>,
|
||||
}
|
||||
|
||||
impl ModeInfo {
|
||||
pub fn new(mode_info_arr: &Vec<(Value, Value)>) -> Result<Self, String> {
|
||||
let mode_info_map = mode_info_arr.to_attrs_map()?;
|
||||
|
||||
let cursor_shape = if let Some(shape) = mode_info_map.get("cursor_shape") {
|
||||
Some(CursorShape::new(shape)?)
|
||||
} else {
|
||||
None
|
||||
};
|
||||
|
||||
let cell_percentage = if let Some(cell_percentage) = mode_info_map.get("cell_percentage") {
|
||||
cell_percentage.as_u64()
|
||||
} else {
|
||||
None
|
||||
};
|
||||
|
||||
Ok(ModeInfo {
|
||||
cursor_shape,
|
||||
cell_percentage,
|
||||
})
|
||||
}
|
||||
|
||||
pub fn cursor_shape(&self) -> Option<&CursorShape> {
|
||||
self.cursor_shape.as_ref()
|
||||
}
|
||||
|
||||
pub fn cell_percentage(&self) -> u64 {
|
||||
self.cell_percentage.unwrap_or(0)
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,232 @@
|
|||
use std::result;
|
||||
|
||||
use neovim_lib::{Value, UiOption};
|
||||
use neovim_lib::neovim_api::Tabpage;
|
||||
|
||||
use shell;
|
||||
|
||||
use value::ValueMapExt;
|
||||
|
||||
use super::repaint_mode::RepaintMode;
|
||||
use super::mode_info::ModeInfo;
|
||||
|
||||
pub trait RedrawEvents {
|
||||
fn on_cursor_goto(&mut self, row: u64, col: u64) -> RepaintMode;
|
||||
|
||||
fn on_put(&mut self, text: &str) -> RepaintMode;
|
||||
|
||||
fn on_clear(&mut self) -> RepaintMode;
|
||||
|
||||
fn on_resize(&mut self, columns: u64, rows: u64) -> RepaintMode;
|
||||
|
||||
fn on_redraw(&mut self, mode: &RepaintMode);
|
||||
|
||||
fn on_highlight_set(&mut self, attrs: &[(Value, Value)]) -> RepaintMode;
|
||||
|
||||
fn on_eol_clear(&mut self) -> RepaintMode;
|
||||
|
||||
fn on_set_scroll_region(&mut self, top: u64, bot: u64, left: u64, right: u64) -> RepaintMode;
|
||||
|
||||
fn on_scroll(&mut self, count: i64) -> RepaintMode;
|
||||
|
||||
fn on_update_bg(&mut self, bg: i64) -> RepaintMode;
|
||||
|
||||
fn on_update_fg(&mut self, fg: i64) -> RepaintMode;
|
||||
|
||||
fn on_update_sp(&mut self, sp: i64) -> RepaintMode;
|
||||
|
||||
fn on_mode_change(&mut self, mode: &str, idx: u64) -> RepaintMode;
|
||||
|
||||
fn on_mouse(&mut self, on: bool) -> RepaintMode;
|
||||
|
||||
fn on_busy(&mut self, busy: bool) -> RepaintMode;
|
||||
|
||||
fn popupmenu_show(
|
||||
&mut self,
|
||||
menu: &[Vec<&str>],
|
||||
selected: i64,
|
||||
row: u64,
|
||||
col: u64,
|
||||
) -> RepaintMode;
|
||||
|
||||
fn popupmenu_hide(&mut self) -> RepaintMode;
|
||||
|
||||
fn popupmenu_select(&mut self, selected: i64) -> RepaintMode;
|
||||
|
||||
fn tabline_update(
|
||||
&mut self,
|
||||
selected: Tabpage,
|
||||
tabs: Vec<(Tabpage, Option<String>)>,
|
||||
) -> RepaintMode;
|
||||
|
||||
fn mode_info_set(
|
||||
&mut self,
|
||||
cursor_style_enabled: bool,
|
||||
mode_info: Vec<ModeInfo>,
|
||||
) -> RepaintMode;
|
||||
}
|
||||
|
||||
pub trait GuiApi {
|
||||
fn set_font(&mut self, font_desc: &str);
|
||||
}
|
||||
|
||||
macro_rules! try_str {
|
||||
($exp:expr) => ($exp.as_str().ok_or_else(|| "Can't convert argument to string".to_owned())?)
|
||||
}
|
||||
|
||||
macro_rules! try_int {
|
||||
($expr:expr) => ($expr.as_i64().ok_or_else(|| "Can't convert argument to int".to_owned())?)
|
||||
}
|
||||
|
||||
macro_rules! try_uint {
|
||||
($exp:expr) => ($exp.as_u64().ok_or_else(|| "Can't convert argument to u64".to_owned())?)
|
||||
}
|
||||
|
||||
macro_rules! try_bool {
|
||||
($exp:expr) => ($exp.as_bool().ok_or_else(|| "Can't convert argument to bool".to_owned())?)
|
||||
}
|
||||
|
||||
macro_rules! map_array {
|
||||
($arg:expr, $err:expr, |$item:ident| $exp:expr) => (
|
||||
$arg.as_array()
|
||||
.ok_or_else(|| $err)
|
||||
.and_then(|items| items.iter().map(|$item| {
|
||||
$exp
|
||||
}).collect::<Result<Vec<_>, _>>())
|
||||
);
|
||||
($arg:expr, $err:expr, |$item:ident| {$exp:expr}) => (
|
||||
$arg.as_array()
|
||||
.ok_or_else(|| $err)
|
||||
.and_then(|items| items.iter().map(|$item| {
|
||||
$exp
|
||||
}).collect::<Result<Vec<_>, _>>())
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
pub fn call_gui_event(
|
||||
ui: &mut shell::State,
|
||||
method: &str,
|
||||
args: &Vec<Value>,
|
||||
) -> result::Result<(), String> {
|
||||
match method {
|
||||
"Font" => ui.set_font(try_str!(args[0])),
|
||||
"Option" => {
|
||||
match try_str!(args[0]) {
|
||||
"Popupmenu" => {
|
||||
ui.nvim()
|
||||
.ok_or_else(|| "Nvim not initialized".to_owned())
|
||||
.and_then(|mut nvim| {
|
||||
nvim.set_option(UiOption::ExtPopupmenu(try_uint!(args[1]) == 1))
|
||||
.map_err(|e| e.to_string())
|
||||
})?
|
||||
}
|
||||
"Tabline" => {
|
||||
ui.nvim()
|
||||
.ok_or_else(|| "Nvim not initialized".to_owned())
|
||||
.and_then(|mut nvim| {
|
||||
nvim.set_option(UiOption::ExtTabline(try_uint!(args[1]) == 1))
|
||||
.map_err(|e| e.to_string())
|
||||
})?
|
||||
}
|
||||
opt => error!("Unknown option {}", opt),
|
||||
}
|
||||
}
|
||||
_ => return Err(format!("Unsupported event {}({:?})", method, args)),
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
|
||||
pub fn call(
|
||||
ui: &mut shell::State,
|
||||
method: &str,
|
||||
args: &[Value],
|
||||
) -> result::Result<RepaintMode, String> {
|
||||
let repaint_mode = match method {
|
||||
"cursor_goto" => ui.on_cursor_goto(try_uint!(args[0]), try_uint!(args[1])),
|
||||
"put" => ui.on_put(try_str!(args[0])),
|
||||
"clear" => ui.on_clear(),
|
||||
"resize" => ui.on_resize(try_uint!(args[0]), try_uint!(args[1])),
|
||||
"highlight_set" => {
|
||||
if let Value::Map(ref attrs) = args[0] {
|
||||
ui.on_highlight_set(attrs);
|
||||
} else {
|
||||
panic!("Supports only map value as argument");
|
||||
}
|
||||
RepaintMode::Nothing
|
||||
}
|
||||
"eol_clear" => ui.on_eol_clear(),
|
||||
"set_scroll_region" => {
|
||||
ui.on_set_scroll_region(
|
||||
try_uint!(args[0]),
|
||||
try_uint!(args[1]),
|
||||
try_uint!(args[2]),
|
||||
try_uint!(args[3]),
|
||||
);
|
||||
RepaintMode::Nothing
|
||||
}
|
||||
"scroll" => ui.on_scroll(try_int!(args[0])),
|
||||
"update_bg" => ui.on_update_bg(try_int!(args[0])),
|
||||
"update_fg" => ui.on_update_fg(try_int!(args[0])),
|
||||
"update_sp" => ui.on_update_sp(try_int!(args[0])),
|
||||
"mode_change" => ui.on_mode_change(try_str!(args[0]), try_uint!(args[1])),
|
||||
"mouse_on" => ui.on_mouse(true),
|
||||
"mouse_off" => ui.on_mouse(false),
|
||||
"busy_start" => ui.on_busy(true),
|
||||
"busy_stop" => ui.on_busy(false),
|
||||
"popupmenu_show" => {
|
||||
let menu_items = map_array!(args[0], "Error get menu list array", |item| {
|
||||
map_array!(item, "Error get menu item array", |col| {
|
||||
col.as_str().ok_or("Error get menu column")
|
||||
})
|
||||
})?;
|
||||
|
||||
ui.popupmenu_show(
|
||||
&menu_items,
|
||||
try_int!(args[1]),
|
||||
try_uint!(args[2]),
|
||||
try_uint!(args[3]),
|
||||
)
|
||||
}
|
||||
"popupmenu_hide" => ui.popupmenu_hide(),
|
||||
"popupmenu_select" => ui.popupmenu_select(try_int!(args[0])),
|
||||
"tabline_update" => {
|
||||
let tabs_out = map_array!(args[1], "Error get tabline list".to_owned(), |tab| {
|
||||
tab.as_map()
|
||||
.ok_or_else(|| "Error get map for tab".to_owned())
|
||||
.and_then(|tab_map| tab_map.to_attrs_map())
|
||||
.map(|tab_attrs| {
|
||||
let name_attr = tab_attrs.get("name").and_then(
|
||||
|n| n.as_str().map(|s| s.to_owned()),
|
||||
);
|
||||
let tab_attr = tab_attrs
|
||||
.get("tab")
|
||||
.map(|tab_id| Tabpage::new(tab_id.clone()))
|
||||
.unwrap();
|
||||
|
||||
(tab_attr, name_attr)
|
||||
})
|
||||
})?;
|
||||
ui.tabline_update(Tabpage::new(args[0].clone()), tabs_out)
|
||||
}
|
||||
"mode_info_set" => {
|
||||
let mode_info = map_array!(
|
||||
args[1],
|
||||
"Error get array key value for mode_info".to_owned(),
|
||||
|mi| {
|
||||
mi.as_map()
|
||||
.ok_or_else(|| "Erro get map for mode_info".to_owned())
|
||||
.and_then(|mi_map| ModeInfo::new(mi_map))
|
||||
}
|
||||
)?;
|
||||
ui.mode_info_set(try_bool!(args[0]), mode_info)
|
||||
}
|
||||
_ => {
|
||||
println!("Event {}({:?})", method, args);
|
||||
RepaintMode::Nothing
|
||||
}
|
||||
};
|
||||
|
||||
Ok(repaint_mode)
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,61 @@
|
|||
use ui_model::{ModelRect, ModelRectVec};
|
||||
|
||||
#[derive(Clone, Debug)]
|
||||
pub enum RepaintMode {
|
||||
Nothing,
|
||||
All,
|
||||
AreaList(ModelRectVec),
|
||||
Area(ModelRect),
|
||||
}
|
||||
|
||||
impl RepaintMode {
|
||||
pub fn join(self, mode: RepaintMode) -> RepaintMode {
|
||||
match (self, mode) {
|
||||
(RepaintMode::Nothing, m) => m,
|
||||
(m, RepaintMode::Nothing) => m,
|
||||
(RepaintMode::All, _) => RepaintMode::All,
|
||||
(_, RepaintMode::All) => RepaintMode::All,
|
||||
(RepaintMode::Area(mr1), RepaintMode::Area(mr2)) => {
|
||||
let mut vec = ModelRectVec::new(mr1);
|
||||
vec.join(&mr2);
|
||||
RepaintMode::AreaList(vec)
|
||||
}
|
||||
(RepaintMode::AreaList(mut target), RepaintMode::AreaList(source)) => {
|
||||
for s in &source.list {
|
||||
target.join(s);
|
||||
}
|
||||
RepaintMode::AreaList(target)
|
||||
}
|
||||
(RepaintMode::AreaList(mut list), RepaintMode::Area(l2)) => {
|
||||
list.join(&l2);
|
||||
RepaintMode::AreaList(list)
|
||||
}
|
||||
(RepaintMode::Area(l1), RepaintMode::AreaList(mut list)) => {
|
||||
list.join(&l1);
|
||||
RepaintMode::AreaList(list)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
||||
#[test]
|
||||
fn test_mode() {
|
||||
let mode = RepaintMode::Area(ModelRect::point(1, 1));
|
||||
let mode = mode.join(RepaintMode::Nothing);
|
||||
|
||||
match mode {
|
||||
RepaintMode::Area(ref rect) => {
|
||||
assert_eq!(1, rect.top);
|
||||
assert_eq!(1, rect.bot);
|
||||
assert_eq!(1, rect.left);
|
||||
assert_eq!(1, rect.right);
|
||||
}
|
||||
_ => panic!("mode is worng"),
|
||||
}
|
||||
}
|
||||
}
|
||||
33
src/shell.rs
33
src/shell.rs
|
|
@ -766,22 +766,27 @@ fn init_nvim_async(
|
|||
});
|
||||
|
||||
// attach ui
|
||||
if let Err(err) = nvim::post_start_init(
|
||||
&mut nvim,
|
||||
options.open_path.as_ref(),
|
||||
cols as u64,
|
||||
rows as u64,
|
||||
)
|
||||
{
|
||||
show_nvim_init_error(&err, state_arc.clone());
|
||||
} else {
|
||||
set_nvim_initialized(nvim, state_arc);
|
||||
}
|
||||
}
|
||||
|
||||
fn set_nvim_initialized(nvim: Neovim, state_arc: Arc<UiMutex<State>>) {
|
||||
let mut nvim = Some(nvim);
|
||||
glib::idle_add(move || {
|
||||
let mut nvim = nvim.take().unwrap();
|
||||
if let Err(err) = nvim::post_start_init(
|
||||
&mut nvim,
|
||||
options.open_path.as_ref(),
|
||||
cols as u64,
|
||||
rows as u64,
|
||||
)
|
||||
{
|
||||
show_nvim_init_error(&err, state_arc.clone());
|
||||
} else {
|
||||
let mut state = state_arc.borrow_mut();
|
||||
state.nvim.borrow_mut().set_initialized(nvim);
|
||||
state.cursor.as_mut().unwrap().start();
|
||||
}
|
||||
let mut state = state_arc.borrow_mut();
|
||||
state.nvim.borrow_mut().set_initialized(
|
||||
nvim.take().unwrap(),
|
||||
);
|
||||
state.cursor.as_mut().unwrap().start();
|
||||
|
||||
Continue(false)
|
||||
});
|
||||
|
|
|
|||
Loading…
Reference in New Issue