mirror/rustdesk
1
0
Fork 0
mirror of https://github.com/rustdesk/rustdesk.git synced 2024-11-24 04:12:20 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

mouse forward back support on windows

Browse Source 
Signed-off-by: fufesou <shuanglongchen@yeah.net>
This commit is contained in:
fufesou 2023-01-05 17:14:44 +08:00
parent adb3450d02
commit 97cf85d1b7
5 changed files with 50 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
flutter/lib/models/input_model.dart
View File

@ -466,15 +466,21 @@ class InputModel {
evt['y'] = '${y.round()}';
var buttons = '';
switch (evt['buttons']) {
case 1:
case kPrimaryMouseButton:
buttons = 'left';
break;
case 2:
case kSecondaryMouseButton:
buttons = 'right';
break;
case 4:
case kMiddleMouseButton:
buttons = 'wheel';
break;
case kBackMouseButton:
buttons = 'back';
break;
case kForwardMouseButton:
buttons = 'forward';
break;
}
evt['buttons'] = buttons;
bind.sessionSendMouse(id: id, msg: json.encode(evt));

4
libs/enigo/src/lib.rs
View File

@ -104,6 +104,10 @@ pub enum MouseButton {
Middle,
/// Right mouse button
Right,
/// Back mouse button
Back,
/// Forward mouse button
Forward,
/// Scroll up button
ScrollUp,

16
libs/enigo/src/win/win_impl.rs
View File

@ -134,9 +134,15 @@ impl MouseControllable for Enigo {
MouseButton::Left => MOUSEEVENTF_LEFTDOWN,
MouseButton::Middle => MOUSEEVENTF_MIDDLEDOWN,
MouseButton::Right => MOUSEEVENTF_RIGHTDOWN,
MouseButton::Back => MOUSEEVENTF_XDOWN,
MouseButton::Forward => MOUSEEVENTF_XDOWN,
_ => unimplemented!(),
},
0,
match button {
MouseButton::Back => XBUTTON1 as _,
MouseButton::Forward => XBUTTON2 as _,
_ => 0,
},
0,
0,
);
@ -155,9 +161,15 @@ impl MouseControllable for Enigo {
MouseButton::Left => MOUSEEVENTF_LEFTUP,
MouseButton::Middle => MOUSEEVENTF_MIDDLEUP,
MouseButton::Right => MOUSEEVENTF_RIGHTUP,
MouseButton::Back => MOUSEEVENTF_XUP,
MouseButton::Forward => MOUSEEVENTF_XUP,
_ => unimplemented!(),
},
0,
match button {
MouseButton::Back => XBUTTON1 as _,
MouseButton::Forward => XBUTTON2 as _,
_ => 0,
},
0,
0,
);

8
src/flutter_ffi.rs
View File

@ -885,9 +885,11 @@ pub fn session_send_mouse(id: String, msg: String) {
}
if let Some(buttons) = m.get("buttons") {
mask |= match buttons.as_str() {
"left" => 1,
"right" => 2,
"wheel" => 4,
"left" => 0x01,
"right" => 0x02,
"wheel" => 0x04,
"back" => 0x08,
"forward" => 0x10,
_ => 0,
} << 3;
}

24
src/server/input_service.rs
View File

@ -556,27 +556,39 @@ pub fn handle_mouse_(evt: &MouseEvent) {
en.mouse_move_to(evt.x, evt.y);
}
1 => match buttons {
1 => {
0x01 => {
allow_err!(en.mouse_down(MouseButton::Left));
}
2 => {
0x02 => {
allow_err!(en.mouse_down(MouseButton::Right));
}
4 => {
0x04 => {
allow_err!(en.mouse_down(MouseButton::Middle));
}
0x08 => {
allow_err!(en.mouse_down(MouseButton::Back));
}
0x10 => {
allow_err!(en.mouse_down(MouseButton::Forward));
}
_ => {}
},
2 => match buttons {
1 => {
0x01 => {
en.mouse_up(MouseButton::Left);
}
2 => {
0x02 => {
en.mouse_up(MouseButton::Right);
}
4 => {
0x04 => {
en.mouse_up(MouseButton::Middle);
}
0x08 => {
en.mouse_up(MouseButton::Back);
}
0x10 => {
en.mouse_up(MouseButton::Forward);
}
_ => {}
},
3 | 4 => {