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

fix remote_cursor https://github.com/rustdesk/rustdesk/issues/82, host

Browse Source 
has higher priority to control mouse https://github.com/rustdesk/rustdesk/issues/40
This commit is contained in:
rustdesk 2021-08-04 15:40:34 +08:00
parent 646b11a3ae
commit a70e3e93b0
1 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/ui/remote.tis
View File

@ -192,6 +192,13 @@ function handler.onMouse(evt)
} }
} }
} }
if (!got_mouse_control) {
if (Math.abs(evt.x - cur_local_x) > 12 || Math.abs(evt.y - cur_local_y) > 12) {
got_mouse_control = true;
} else {
return;
}
}
var mask = 0; var mask = 0;
var wheel_delta_x; var wheel_delta_x;
var wheel_delta_y; var wheel_delta_y;
@ -205,7 +212,10 @@ function handler.onMouse(evt)
dragging = false; dragging = false;
break; break;
case Event.MOUSE_MOVE: case Event.MOUSE_MOVE:
if (cursor_img.style#display != "none" && keyboard_enabled) cursor_img.style#display = "none"; if (cursor_img.style#display != "none" && keyboard_enabled) {
cursor_img.style#display = "none";
handler.style#cursor = '';
}
break; break;
case Event.MOUSE_WHEEL: case Event.MOUSE_WHEEL:
// mouseWheelDistance = 8 * [currentUserDefs floatForKey:@"com.apple.scrollwheel.scaling"]; // mouseWheelDistance = 8 * [currentUserDefs floatForKey:@"com.apple.scrollwheel.scaling"];
@ -289,8 +299,8 @@ function handler.onMouse(evt)
x = 0; x = 0;
y = 0; y = 0;
} else { } else {
cur_x = x; cur_local_x = cur_x = x;
cur_y = y; cur_local_y = cur_y = y;
} }
if (mask != 3) { if (mask != 3) {
resetWheel(); resetWheel();
@ -318,6 +328,8 @@ var cur_hoty = 0;
var cur_img = null; var cur_img = null;
var cur_x = 0; var cur_x = 0;
var cur_y = 0; var cur_y = 0;
var cur_local_x = 0;
var cur_local_y = 0;
var cursors = {}; var cursors = {};
var image_binded; var image_binded;
@ -333,7 +345,9 @@ handler.setCursorData = function(id, hotx, hoty, width, height, colors) {
image_binded = true; image_binded = true;
cursors[id] = [img, hotx, hoty, width, height]; cursors[id] = [img, hotx, hoty, width, height];
this.bindImage("in-memory:cursor", img); this.bindImage("in-memory:cursor", img);
if (cursor_img.style#display == 'none') {
self.timer(1ms, function() { handler.style.cursor(cur_img, cur_hotx, cur_hoty); }); self.timer(1ms, function() { handler.style.cursor(cur_img, cur_hotx, cur_hoty); });
}
cur_img = img; cur_img = img;
} }
} }
@ -350,13 +364,17 @@ handler.setCursorId = function(id) {
}; };
img = img[0]; img = img[0];
this.bindImage("in-memory:cursor", img); this.bindImage("in-memory:cursor", img);
if (cursor_img.style#display == 'none') {
self.timer(1ms, function() { handler.style.cursor(cur_img, cur_hotx, cur_hoty); }); self.timer(1ms, function() { handler.style.cursor(cur_img, cur_hotx, cur_hoty); });
}
cur_img = img; cur_img = img;
} }
} }
var got_mouse_control = true;
handler.setCursorPosition = function(x, y) { handler.setCursorPosition = function(x, y) {
if (!image_binded) return; if (!image_binded) return;
got_mouse_control = false;
cur_x = x - display_origin_x; cur_x = x - display_origin_x;
cur_y = y - display_origin_y; cur_y = y - display_origin_y;
var x = cur_x - cur_hotx; var x = cur_x - cur_hotx;
@ -366,9 +384,11 @@ handler.setCursorPosition = function(x, y) {
cursor_img.style.set { cursor_img.style.set {
left: x + "px", left: x + "px",
top: y + "px", top: y + "px",
display: "block",
}; };
handler.style.cursor(null); if (cursor_img.style#display == 'none') {
handler.style#cursor = 'none';
cursor_img.style#display = "block";
}
} }
function self.ready() { function self.ready() {