Skip to content

Add support for mouse buttons 4 & 5 #471

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
guy-bartkus wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Add support for mouse buttons 4 & 5 #471

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
741eb88
Add mouse button 4 and 5 support
guy-bartkus Aug 7, 2024
48bf2e0
Add mouse button 4 and 5 support
guy-bartkus Aug 7, 2024
93769a6
Use conversion fn instead of num_enum crate
guy-bartkus Aug 7, 2024
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: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,4 +56,4 @@ debug-assertions = false
incremental = false
rpath = false
codegen-units = 1
strip = true
strip = true
15 changes: 15 additions & 0 deletions src/event.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,24 @@ pub enum MouseButton {
Left = 0,
Middle = 1,
Right = 2,
MB4 = 3,
MB5 = 4,
Unknown = 255,
}

impl MouseButton {
pub fn from_u8(value: u8) -> MouseButton {
match value {
0 => MouseButton::Left,
1 => MouseButton::Middle,
2 => MouseButton::Right,
3 => MouseButton::MB4,
4 => MouseButton::MB5,
_ => MouseButton::Unknown,
}
}
}

#[derive(Debug, Copy, Clone)]
pub struct Touch {
pub id: u32,
Expand Down
18 changes: 18 additions & 0 deletions src/native/windows.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
use std::convert::TryFrom;

use crate::{
conf::{Conf, Icon},
event::{KeyMods, MouseButton},
Expand Down Expand Up @@ -362,6 +364,14 @@ unsafe extern "system" fn win32_wndproc(

event_handler.mouse_button_down_event(MouseButton::Middle, mouse_x, mouse_y);
}
WM_XBUTTONDOWN => {
let mouse_x = payload.mouse_x;
let mouse_y = payload.mouse_y;
let xbutton = GET_XBUTTON_WPARAM(wparam) as u8;
let which = MouseButton::from_u8(xbutton+2);

event_handler.mouse_button_down_event(which, mouse_x, mouse_y);
}
WM_LBUTTONUP => {
let mouse_x = payload.mouse_x;
let mouse_y = payload.mouse_y;
Expand All @@ -380,6 +390,14 @@ unsafe extern "system" fn win32_wndproc(

event_handler.mouse_button_up_event(MouseButton::Middle, mouse_x, mouse_y);
}
WM_XBUTTONUP => {
let mouse_x = payload.mouse_x;
let mouse_y = payload.mouse_y;
let xbutton = GET_XBUTTON_WPARAM(wparam) as u8;
let which = MouseButton::from_u8(xbutton+2);

event_handler.mouse_button_up_event(which, mouse_x, mouse_y);
}

WM_MOUSEMOVE => {
payload.mouse_x = GET_X_LPARAM(lparam) as f32 * payload.mouse_scale;
Expand Down