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

Make ui as thread local variable

This commit is contained in:
daa84 2016-03-31 13:09:34 +03:00
parent 183f600e1b
commit 2d04cbbdc0
5 changed files with 79 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main.rs
View File

@ -4,18 +4,18 @@ extern crate cairo;
extern crate neovim_lib; extern crate neovim_lib;
extern crate rmp; extern crate rmp;
mod ui_mutex;
mod nvim; mod nvim;
mod ui_model; mod ui_model;
mod ui; mod ui;
use ui::Ui;
fn main() { fn main() {
let ui = Ui::new(); gtk::init().expect("Failed to initialize GTK");
ui.show(); ui::UI.with(|ui_cell| {
let mut ui = ui_cell.borrow_mut();
ui.init();
let nvim = nvim::initialize(ui).expect("Can't start nvim instance"); nvim::initialize(&mut *ui).expect("Can't start nvim instance");
});
gtk::main(); gtk::main();
} }

61
src/nvim.rs
View File

@ -1,16 +1,13 @@
use neovim_lib::{Neovim, NeovimApi, Session}; use neovim_lib::{Neovim, NeovimApi, Session};
use std::io::{Result, Error, ErrorKind}; use std::io::{Result, Error, ErrorKind};
use std::sync::Arc;
use std::result; use std::result;
use ui_model::UiModel; use ui_model::UiModel;
use ui_mutex::UiMutex;
use rmp::Value; use rmp::Value;
use rmp::value::Integer; use rmp::value::Integer;
use ui;
use ui::Ui; use ui::Ui;
use glib; use glib;
pub type SharedUi = Arc<UiMutex<Ui>>;
pub trait RedrawEvents { pub trait RedrawEvents {
fn on_cursor_goto(&mut self, row: u64, col: u64); fn on_cursor_goto(&mut self, row: u64, col: u64);
@ -35,7 +32,7 @@ macro_rules! try_int {
}) })
} }
pub fn initialize(mut ui: Ui) -> Result<SharedUi> { pub fn initialize(ui: &mut Ui) -> Result<()> {
// let mut session = try!(Session::new_tcp("127.0.0.1:6666")); // let mut session = try!(Session::new_tcp("127.0.0.1:6666"));
let session = if cfg!(target_os = "windows") { let session = if cfg!(target_os = "windows") {
Session::new_child_path("E:\\Neovim\\bin\\nvim.exe").unwrap() Session::new_child_path("E:\\Neovim\\bin\\nvim.exe").unwrap()
@ -46,24 +43,17 @@ pub fn initialize(mut ui: Ui) -> Result<SharedUi> {
ui.set_nvim(nvim); ui.set_nvim(nvim);
ui.model = UiModel::new(80, 24); ui.model = UiModel::new(80, 24);
let sh_ui = Arc::new(UiMutex::new(ui)); let mut nvim = ui.nvim();
nvim.session.start_event_loop_cb(move |m, p| nvim_cb(m, p));
// fix neovim --embed bug to start embed mode
nvim.input("i").unwrap();
try!(nvim.ui_attach(80, 24, true).map_err(|e| Error::new(ErrorKind::Other, e)));
{ Ok(())
let mut ui = (*sh_ui).borrow_mut();
let mut nvim = ui.nvim();
let moved_sh_ui = sh_ui.clone();
nvim.session.start_event_loop_cb(move |m, p| nvim_cb(&moved_sh_ui, m, p));
// fix neovim --embed bug to start embed mode
nvim.input("i").unwrap();
try!(nvim.ui_attach(80, 24, true).map_err(|e| Error::new(ErrorKind::Other, e)));
}
Ok(sh_ui)
} }
fn nvim_cb(ui: &SharedUi, method: &str, params: Vec<Value>) { fn nvim_cb(method: &str, params: Vec<Value>) {
if method == "redraw" { if method == "redraw" {
for ev in params { for ev in params {
if let Value::Array(ev_args) = ev { if let Value::Array(ev_args) = ev {
@ -72,7 +62,7 @@ fn nvim_cb(ui: &SharedUi, method: &str, params: Vec<Value>) {
Value::Array(ref ar) => ar.clone(), Value::Array(ref ar) => ar.clone(),
_ => vec![], _ => vec![],
}; };
call(ui, ev_name, args); call(ev_name, args);
} else { } else {
println!("Unsupported event {:?}", ev_args); println!("Unsupported event {:?}", ev_args);
} }
@ -85,29 +75,29 @@ fn nvim_cb(ui: &SharedUi, method: &str, params: Vec<Value>) {
} }
} }
fn call(ui: &SharedUi, method: &str, args: Vec<Value>) { fn call(method: &str, args: Vec<Value>) {
match method { match method {
"cursor_goto" => { "cursor_goto" => {
safe_call(ui, move |ui| { safe_call(move |ui| {
ui.borrow_mut().on_cursor_goto(try_int!(args[0]), try_int!(args[1])); ui.on_cursor_goto(try_int!(args[0]), try_int!(args[1]));
Ok(()) Ok(())
}) })
} }
"put" => { "put" => {
safe_call(ui, move |ui| { safe_call(move |ui| {
ui.borrow_mut().on_put(try_str!(args[0])); ui.on_put(try_str!(args[0]));
Ok(()) Ok(())
}) })
} }
"clear" => { "clear" => {
safe_call(ui, move |ui| { safe_call(move |ui| {
ui.borrow_mut().on_clear(); ui.on_clear();
Ok(()) Ok(())
}) })
} }
"resize" => { "resize" => {
safe_call(ui, move |ui| { safe_call(move |ui| {
ui.borrow_mut().on_resize(try_int!(args[0]), try_int!(args[1])); ui.on_resize(try_int!(args[0]), try_int!(args[1]));
Ok(()) Ok(())
}); });
} }
@ -115,14 +105,15 @@ fn call(ui: &SharedUi, method: &str, args: Vec<Value>) {
}; };
} }
fn safe_call<F>(ui: &SharedUi, cb: F) fn safe_call<F>(cb: F)
where F: Fn(&UiMutex<Ui>) -> result::Result<(), String> + 'static + Send where F: Fn(&mut Ui) -> result::Result<(), String> + 'static + Send
{ {
let sent_ui = ui.clone();
glib::idle_add(move || { glib::idle_add(move || {
if let Err(msg) = cb(&*sent_ui) { ui::UI.with(|ui_cell| {
println!("Error call function: {}", msg); if let Err(msg) = cb(&mut *ui_cell.borrow_mut()) {
} println!("Error call function: {}", msg);
}
});
glib::Continue(false) glib::Continue(false)
}); });
} }

62
src/ui.rs
View File

@ -1,3 +1,6 @@
use std::cell::RefCell;
use std::thread;
use cairo; use cairo;
use gtk; use gtk;
use gtk::prelude::*; use gtk::prelude::*;
@ -7,15 +10,26 @@ use neovim_lib::Neovim;
use ui_model::UiModel; use ui_model::UiModel;
use nvim::RedrawEvents; use nvim::RedrawEvents;
thread_local!(pub static UI: RefCell<Ui> = {
let thread = thread::current();
let current_thread_name = thread.name();
if current_thread_name != Some("<main>") {
panic!("Can create UI only from main thread, {:?}", current_thread_name);
}
RefCell::new(Ui::new())
});
pub struct Ui { pub struct Ui {
pub model: UiModel, pub model: UiModel,
nvim: Option<Neovim>, nvim: Option<Neovim>,
drawing_area: DrawingArea,
} }
impl Ui { impl Ui {
pub fn new() -> Ui { pub fn new() -> Ui {
Ui { Ui {
model: UiModel::empty(), model: UiModel::empty(),
drawing_area: DrawingArea::new(),
nvim: None, nvim: None,
} }
} }
@ -28,8 +42,8 @@ impl Ui {
self.nvim.as_mut().unwrap() self.nvim.as_mut().unwrap()
} }
pub fn show(&self) { pub fn init(&mut self) {
gtk::init().expect("Failed to initialize GTK");
let window = Window::new(WindowType::Toplevel); let window = Window::new(WindowType::Toplevel);
let grid = Grid::new(); let grid = Grid::new();
@ -52,30 +66,41 @@ impl Ui {
grid.attach(&button_bar, 0, 0, 1, 1); grid.attach(&button_bar, 0, 0, 1, 1);
let drawing_area = DrawingArea::new(); self.drawing_area.set_size_request(500, 500);
drawing_area.set_size_request(500, 500); self.drawing_area.set_hexpand(true);
drawing_area.connect_draw(Self::gtk_draw); self.drawing_area.set_vexpand(true);
grid.attach(&drawing_area, 0, 1, 1, 1); grid.attach(&self.drawing_area, 0, 1, 1, 1);
self.drawing_area.connect_draw(gtk_draw);
window.add(&grid); window.add(&grid);
window.show_all(); window.show_all();
window.connect_delete_event(|_,_| { window.connect_delete_event(|_, _| {
gtk::main_quit(); gtk::main_quit();
Inhibit(false) Inhibit(false)
}); });
} }
}
fn gtk_draw(drawing_area: &DrawingArea, ctx: &cairo::Context) -> Inhibit { fn gtk_draw(drawing_area: &DrawingArea, ctx: &cairo::Context) -> Inhibit {
let width = drawing_area.get_allocated_width() as f64; let width = drawing_area.get_allocated_width() as f64;
let height = drawing_area.get_allocated_height() as f64; let height = drawing_area.get_allocated_height() as f64;
ctx.set_source_rgb(1.0, 0.0, 0.0);
ctx.arc(width / 2.0, height / 2.0, let font_face = cairo::FontFace::toy_create("",
width / 2.0, cairo::enums::FontSlant::Normal,
0.0, 2.0 * 3.14); cairo::enums::FontWeight::Normal);
ctx.fill(); ctx.set_font_face(font_face);
Inhibit(true) UI.with(|ui_cell| {
} ctx.set_source_rgb(0.0, 0.0, 0.0);
let ui = ui_cell.borrow();
let mut line_y = 30.0;
for line in ui.model.lines() {
ctx.move_to(0.0, line_y);
ctx.show_text(&line);
line_y += 30.0;
}
});
Inhibit(true)
} }
impl RedrawEvents for Ui { impl RedrawEvents for Ui {
@ -95,4 +120,3 @@ impl RedrawEvents for Ui {
self.model = UiModel::new(rows, columns); self.model = UiModel::new(rows, columns);
} }
} }

4
src/ui_model.rs
View File

@ -43,6 +43,10 @@ impl UiModel {
} }
} }
pub fn lines(&self) -> Vec<String> {
self.model.iter().map(|r| r.iter().map(|c| c.ch).collect::<String>()).collect()
}
pub fn set_cursor(&mut self, row: u64, col: u64) { pub fn set_cursor(&mut self, row: u64, col: u64) {
self.cur_col = col as usize; self.cur_col = col as usize;
self.cur_row = row as usize; self.cur_row = row as usize;

32
src/ui_mutex.rs
View File

@ -1,32 +0,0 @@
use std::cell::{RefCell, RefMut};
use std::thread;
pub struct UiMutex<T: Sized> {
data: RefCell<T>,
main_thread_name: Option<String>,
}
// here sync used to mark that internal data is acessed only from main thread
// this behaviour works because of borrow_mut check thread name
unsafe impl<T: Sized + Send> Sync for UiMutex<T> {}
impl<T> UiMutex<T> {
pub fn new(t: T) -> UiMutex<T> {
UiMutex {
data: RefCell::new(t),
main_thread_name: thread::current().name().map(|v| v.to_owned()),
}
}
pub fn borrow_mut(&self) -> RefMut<T> {
let current_thread_name = thread::current().name().map(|v| v.to_owned());
if current_thread_name != self.main_thread_name {
panic!("Can access value only from main thread, {:?}/{:?}", current_thread_name, self.main_thread_name);
}
self.data.borrow_mut()
}
}