Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/event.rs
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,8 @@ pub trait EventHandler {
fn mouse_wheel_event(&mut self, _x: f32, _y: f32) {}
fn mouse_button_down_event(&mut self, _button: MouseButton, _x: f32, _y: f32) {}
fn mouse_button_up_event(&mut self, _button: MouseButton, _x: f32, _y: f32) {}
fn mouse_leave_event(&mut self) {}
fn mouse_enter_event(&mut self, _button: MouseButton ,_x: f32, _y: f32 ) {}

fn char_event(&mut self, _character: char, _keymods: KeyMods, _repeat: bool) {}

Expand Down
25 changes: 18 additions & 7 deletions src/native/linux_x11.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ mod xi_input;
use crate::{
event::EventHandler,
native::{egl, gl, module, NativeDisplayData, Request},
CursorIcon,
CursorIcon, MouseButton,
};

use libx11::*;
Expand Down Expand Up @@ -121,17 +121,28 @@ impl X11Display {
event_handler.mouse_button_up_event(btn, x, y);
}
}
7 => {
// Mouse Enter
}
8 => {
// Mouse Leave
}
6 => {
let x = event.xmotion.x as libc::c_float;
let y = event.xmotion.y as libc::c_float;
event_handler.mouse_motion_event(x, y);
}
7 => {
let x = event.xcrossing.x as libc::c_float;
let y = event.xcrossing.y as libc::c_float;
let state = event.xcrossing.state as libc::c_long;

let btn = match () {
_ if (state & Button1MotionMask) != 0 => MouseButton::Left,
_ if (state & Button2MotionMask) != 0 => MouseButton::Middle,
_ if (state & Button3MotionMask) != 0 => MouseButton::Right,
_ => MouseButton::Unknown,
};
event_handler.mouse_enter_event( btn , x, y);

}
8 => {
event_handler.mouse_leave_event();
}
9 => {
event_handler.window_restored_event();
}
Expand Down
Loading