not-fl3 · guy-bartkus · Aug 7, 2024 · Aug 7, 2024 · Aug 7, 2024
diff --git a/Cargo.toml b/Cargo.toml
@@ -56,4 +56,4 @@ debug-assertions = false
 incremental = false
 rpath = false
 codegen-units = 1
-strip = true
+strip = true
diff --git a/src/event.rs b/src/event.rs
@@ -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,

diff --git a/src/native/windows.rs b/src/native/windows.rs
@@ -1,3 +1,5 @@
+use std::convert::TryFrom;
+
 use crate::{
     conf::{Conf, Icon},
     event::{KeyMods, MouseButton},
@@ -160,7 +162,7 @@
        unsafe {
            #[cfg(target_arch = "x86_64")]
            SetWindowLongPtrA(self.wnd, GWL_STYLE, win_style as _);
            #[cfg(target_arch = "i686")]
            SetWindowLong(self.wnd, GWL_STYLE, win_style as _);

            if self.fullscreen {
@@ -362,6 +364,14 @@
 
             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;
@@ -380,6 +390,14 @@
 
             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;
@@ -823,7 +841,7 @@

    fn process_request(&mut self, request: Request) {
        use Request::*;
        unsafe {
            match request {
                ScheduleUpdate => {
                    self.update_requested = true;
@@ -837,7 +855,7 @@
                } => self.set_window_size(new_width as _, new_height as _),
                SetWindowPosition { new_x, new_y } => self.set_window_position(new_x, new_y),
                SetFullscreen(fullscreen) => self.set_fullscreen(fullscreen),
                ShowKeyboard(show) => {
                    eprintln!("Not implemented for windows")
                }
            }
@@ -916,7 +934,7 @@

        #[cfg(target_arch = "x86_64")]
        SetWindowLongPtrA(wnd, GWLP_USERDATA, &mut display as *mut _ as isize);
        #[cfg(target_arch = "i686")]
        SetWindowLong(wnd, GWLP_USERDATA, &mut display as *mut _ as isize);

        let mut done = false;