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

cargo-fmt, version update

This commit is contained in:
daa 2017-02-26 22:33:44 +03:00
parent f41d3dd55a
commit b49d93dc96
5 changed files with 23 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.toml
View File

@ -1,6 +1,6 @@
[package] [package]
name = "neovim-gtk" name = "neovim-gtk"
version = "0.1.0" version = "0.1.1"
authors = ["daa84 <daa84@inbox.ru>"] authors = ["daa84 <daa84@inbox.ru>"]
build = "build.rs" build = "build.rs"

2
src/main.rs
View File

@ -25,7 +25,7 @@ fn main() {
guard_dispatch_thread(&mut *ui); guard_dispatch_thread(&mut *ui);
}); });
gtk::main(); gtk::main();
} }
fn guard_dispatch_thread(ui: &mut ui::Ui) { fn guard_dispatch_thread(ui: &mut ui::Ui) {

41
src/nvim.rs
View File

@ -75,7 +75,7 @@ pub fn initialize(ui: &mut Ui) -> Result<()> {
nvim.session.start_event_loop_cb(move |m, p| nvim_cb(m, p)); nvim.session.start_event_loop_cb(move |m, p| nvim_cb(m, p));
// fix neovim --embed bug to start embed mode // fix neovim --embed bug to start embed mode
nvim.input("i").unwrap(); nvim.input("i").unwrap();
try!(nvim.ui_attach(80, 24, true).map_err(|e| Error::new(ErrorKind::Other, e))); nvim.ui_attach(80, 24, true).map_err(|e| Error::new(ErrorKind::Other, e))?;
Ok(()) Ok(())
} }
@ -139,21 +139,11 @@ fn call(method: &str, args: Vec<Value>) {
safe_call(move |ui| { safe_call(move |ui| {
if let Value::Map(ref attrs) = args[0] { if let Value::Map(ref attrs) = args[0] {
let attrs_map: HashMap<String, Value> = attrs.iter() let attrs_map: HashMap<String, Value> = attrs.iter()
.map(|v| { .map(|v| match v {
match v { &(Value::String(ref key), ref value) => (key.clone(), value.clone()),
&(Value::String(ref key), _ => panic!("attribute key must be string"),
ref value) => { })
(key.clone(), .collect();
value.clone())
}
_ => {
panic!("attribute \
key must be \
string")
}
}
})
.collect();
ui.on_highlight_set(&attrs_map); ui.on_highlight_set(&attrs_map);
} else { } else {
panic!("Supports only map value as argument"); panic!("Supports only map value as argument");
@ -168,25 +158,28 @@ fn call(method: &str, args: Vec<Value>) {
}) })
} }
"set_scroll_region" => { "set_scroll_region" => {
safe_call(move |ui| { safe_call(move |ui| {
ui.on_set_scroll_region(try_uint!(args[0]), try_uint!(args[1]), try_uint!(args[2]), try_uint!(args[3])); ui.on_set_scroll_region(try_uint!(args[0]),
try_uint!(args[1]),
try_uint!(args[2]),
try_uint!(args[3]));
Ok(()) Ok(())
}); });
} }
"scroll" => { "scroll" => {
safe_call(move |ui| { safe_call(move |ui| {
ui.on_scroll(try_int!(args[0])); ui.on_scroll(try_int!(args[0]));
Ok(()) Ok(())
}); });
} }
"update_bg" => { "update_bg" => {
safe_call(move |ui| { safe_call(move |ui| {
ui.on_update_bg(try_int!(args[0])); ui.on_update_bg(try_int!(args[0]));
Ok(()) Ok(())
}); });
} }
"update_fg" => { "update_fg" => {
safe_call(move |ui| { safe_call(move |ui| {
ui.on_update_fg(try_int!(args[0])); ui.on_update_fg(try_int!(args[0]));
Ok(()) Ok(())
}); });
@ -217,10 +210,8 @@ fn safe_call<F>(cb: F)
where F: Fn(&mut Ui) -> result::Result<(), String> + 'static + Send where F: Fn(&mut Ui) -> result::Result<(), String> + 'static + Send
{ {
glib::idle_add(move || { glib::idle_add(move || {
ui::UI.with(|ui_cell| { ui::UI.with(|ui_cell| if let Err(msg) = cb(&mut *ui_cell.borrow_mut()) {
if let Err(msg) = cb(&mut *ui_cell.borrow_mut()) { println!("Error call function: {}", msg);
println!("Error call function: {}", msg);
}
}); });
glib::Continue(false) glib::Continue(false)
}); });

2
src/ui.rs
View File

@ -116,7 +116,7 @@ impl Ui {
self.drawing_area self.drawing_area
.set_events((gdk_sys::GDK_BUTTON_RELEASE_MASK | gdk_sys::GDK_BUTTON_PRESS_MASK | .set_events((gdk_sys::GDK_BUTTON_RELEASE_MASK | gdk_sys::GDK_BUTTON_PRESS_MASK |
gdk_sys::GDK_BUTTON_MOTION_MASK) gdk_sys::GDK_BUTTON_MOTION_MASK)
.bits() as i32); .bits() as i32);
self.drawing_area.connect_button_press_event(gtk_button_press); self.drawing_area.connect_button_press_event(gtk_button_press);
self.drawing_area.connect_button_release_event(gtk_button_release); self.drawing_area.connect_button_release_event(gtk_button_release);
self.drawing_area.connect_motion_notify_event(gtk_motion_notify); self.drawing_area.connect_motion_notify_event(gtk_motion_notify);

8
src/ui_model.rs
View File

@ -119,10 +119,10 @@ impl UiModel {
fn copy_row(&mut self, row: usize, offset: i64, left: usize, right: usize) { fn copy_row(&mut self, row: usize, offset: i64, left: usize, right: usize) {
for col in left..right + 1 { for col in left..right + 1 {
let from_row = (row as i64 + offset) as usize; let from_row = (row as i64 + offset) as usize;
let from_cell = self.model[from_row][col].clone(); let from_cell = self.model[from_row][col].clone();
self.model[row][col] = from_cell; self.model[row][col] = from_cell;
} }
} }
pub fn scroll(&mut self, count: i64) { pub fn scroll(&mut self, count: i64) {