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

Support right mouse and release events

This commit is contained in:
daa84 2017-10-13 11:43:07 +03:00
parent 3714817604
commit 968f5762c4
1 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/shell.rs
View File

@ -341,7 +341,6 @@ impl State {
nvim.input(&paste_code).report_err(&mut *nvim); nvim.input(&paste_code).report_err(&mut *nvim);
} }
} }
} }
pub struct UiState { pub struct UiState {
@ -432,10 +431,15 @@ impl Shell {
) )
}); });
let ref_state = self.state.clone();
let ref_ui_state = self.ui_state.clone(); let ref_ui_state = self.ui_state.clone();
state.drawing_area.connect_button_release_event( state.drawing_area.connect_button_release_event(
move |_, _| { move |_, ev| {
gtk_button_release(&mut *ref_ui_state.borrow_mut()) gtk_button_release(
&mut *ref_state.borrow_mut(),
&mut *ref_ui_state.borrow_mut(),
ev,
)
}, },
); );
@ -636,10 +640,15 @@ fn gtk_button_press(shell: &mut State, ui_state: &mut UiState, ev: &EventButton)
if shell.mouse_enabled { if shell.mouse_enabled {
ui_state.mouse_pressed = true; ui_state.mouse_pressed = true;
match ev.get_button() {
1 => mouse_input(shell, "LeftMouse", ev.get_state(), ev.get_position()),
2 => {
mouse_input(shell, "LeftMouse", ev.get_state(), ev.get_position()); mouse_input(shell, "LeftMouse", ev.get_state(), ev.get_position());
if ev.get_button() == 2 {
shell.edit_paste("*"); shell.edit_paste("*");
} }
3 => mouse_input(shell, "RightMouse", ev.get_state(), ev.get_position()),
_ => (),
}
} }
Inhibit(false) Inhibit(false)
} }
@ -663,8 +672,18 @@ fn mouse_input(shell: &mut State, input: &str, state: ModifierType, position: (f
} }
} }
fn gtk_button_release(ui_state: &mut UiState) -> Inhibit { fn gtk_button_release(shell: &mut State, ui_state: &mut UiState, ev: &EventButton) -> Inhibit {
ui_state.mouse_pressed = false; ui_state.mouse_pressed = false;
if shell.mouse_enabled {
match ev.get_button() {
1 => mouse_input(shell, "LeftRelease", ev.get_state(), ev.get_position()),
2 => mouse_input(shell, "MiddleRelease", ev.get_state(), ev.get_position()),
3 => mouse_input(shell, "RightRelease", ev.get_state(), ev.get_position()),
_ => (),
}
}
Inhibit(false) Inhibit(false)
} }