mirrors/Remotely
3
0
Fork 0
mirror of https://github.com/immense/Remotely.git synced 2025-10-26 11:27:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

More touch fixes. CursorIconWatcher fix.

Browse Source
This commit is contained in:
Jared Goodwin 2019-03-21 08:05:46 -07:00
parent ef641bd2c1
commit e76ad3b734
4 changed files with 115 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
Remotely_ScreenCast/Capture/CursorIconWatcher.cs
View File

@ -28,27 +28,42 @@ namespace Remotely_ScreenCast.Capture
public CursorInfo GetCurrentCursor()
{
var ci = new User32.CursorInfo();
ci.cbSize = Marshal.SizeOf(ci);
User32.GetCursorInfo(out ci);
using (var icon = Icon.FromHandle(ci.hCursor))
try
{
using (var ms = new MemoryStream())
var ci = new User32.CursorInfo();
ci.cbSize = Marshal.SizeOf(ci);
User32.GetCursorInfo(out ci);
if (ci.flags == User32.CURSOR_SHOWING)
{
using (var cursor = new Cursor(ci.hCursor))
using (var icon = Icon.FromHandle(ci.hCursor))
{
if (cursor.ToString() == Cursors.IBeam.ToString())
using (var ms = new MemoryStream())
{
return new CursorInfo(new byte[0], Point.Empty, "text");
}
else
{
var hotspot = cursor.HotSpot;
icon.ToBitmap().Save(ms, ImageFormat.Png);
return new CursorInfo(ms.ToArray(), hotspot);
using (var cursor = new Cursor(ci.hCursor))
{
if (cursor.ToString() == Cursors.IBeam.ToString())
{
return new CursorInfo(new byte[0], Point.Empty, "text");
}
else
{
var hotspot = cursor.HotSpot;
icon.ToBitmap().Save(ms, ImageFormat.Png);
return new CursorInfo(ms.ToArray(), hotspot);
}
}
}
}
}
else
{
return new CursorInfo(new byte[0], Point.Empty, "none");
}
}
catch
{
return new CursorInfo(new byte[0], Point.Empty, "none");
}
}
private CursorIconWatcher()
@ -102,7 +117,10 @@ namespace Remotely_ScreenCast.Capture
OnChange?.Invoke(this, new CursorInfo(new byte[0], Point.Empty, "default"));
}
}
catch { }
catch
{
OnChange?.Invoke(this, new CursorInfo(new byte[0], Point.Empty, "none"));
}
}
}

62
Remotely_Server/wwwroot/scripts/RemoteControl/UI.js
View File

@ -20,9 +20,10 @@ var lastPointerMove = Date.now();
var isDragging;
var currentPointerDevice;
var currentTouchCount;
var rightClickOpen;
var longPressTimer;
var cancelNextClick;
var isPinchZooming;
var startPinchPoint1;
var startPinchPoint2;
export function ApplyInputHandlers(sockets) {
document.querySelector("#menuButton").addEventListener("click", (ev) => {
HorizontalBars.forEach(x => {
@ -113,8 +114,16 @@ export function ApplyInputHandlers(sockets) {
document.querySelector("#connectButton").addEventListener("click", (ev) => {
ConnectToClient();
});
ScreenViewer.addEventListener("pointermove", function (e) {
currentPointerDevice = e.pointerType;
});
ScreenViewer.addEventListener("pointerdown", function (e) {
currentPointerDevice = e.pointerType;
});
ScreenViewer.addEventListener("pointerenter", function (e) {
currentPointerDevice = e.pointerType;
});
ScreenViewer.addEventListener("mousemove", function (e) {
currentPointerDevice = "Mouse";
e.preventDefault();
if (Date.now() - lastPointerMove < 25) {
return;
@ -125,6 +134,9 @@ export function ApplyInputHandlers(sockets) {
sockets.SendMouseMove(percentX, percentY);
});
ScreenViewer.addEventListener("mousedown", function (e) {
if (currentPointerDevice == "touch") {
return;
}
if (e.button != 0 && e.button != 2) {
return;
}
@ -134,6 +146,9 @@ export function ApplyInputHandlers(sockets) {
sockets.SendMouseDown(e.button, percentX, percentY);
});
ScreenViewer.addEventListener("mouseup", function (e) {
if (currentPointerDevice == "touch") {
return;
}
if (e.button != 0 && e.button != 2) {
return;
}
@ -147,36 +162,34 @@ export function ApplyInputHandlers(sockets) {
cancelNextClick = false;
return;
}
if (currentPointerDevice == "Mouse") {
if (currentPointerDevice == "mouse") {
e.preventDefault();
e.stopPropagation();
}
else if (currentPointerDevice == "Touch" && currentTouchCount == 0) {
else if (currentPointerDevice == "touch" && currentTouchCount == 0) {
var percentX = e.offsetX / ScreenViewer.clientWidth;
var percentY = e.offsetY / ScreenViewer.clientHeight;
sockets.SendTap(percentX, percentY);
}
});
ScreenViewer.addEventListener("dblclick", function (e) {
if (currentPointerDevice == "mouse") {
return;
}
var percentX = e.offsetX / ScreenViewer.clientWidth;
var percentY = e.offsetY / ScreenViewer.clientHeight;
sockets.SendMouseDown(2, percentX, percentY);
sockets.SendMouseUp(2, percentX, percentY);
});
ScreenViewer.addEventListener("contextmenu", (ev) => {
ev.preventDefault();
});
ScreenViewer.addEventListener("touchstart", function (e) {
if (rightClickOpen) {
e.preventDefault();
e.stopPropagation();
return;
}
if (e.touches.length > 1) {
cancelNextClick = true;
}
if (e.touches.length == 2) {
startPinchPoint1 = { X: e.touches[0].pageX, Y: e.touches[0].pageY, IsEmpty: false };
startPinchPoint2 = { X: e.touches[1].pageX, Y: e.touches[1].pageY, IsEmpty: false };
}
isDragging = false;
currentPointerDevice = "Touch";
currentTouchCount = e.touches.length;
KeyboardButton.removeAttribute("hidden");
var focusedInput = document.querySelector("input:focus");
@ -185,16 +198,15 @@ export function ApplyInputHandlers(sockets) {
}
});
ScreenViewer.addEventListener("touchmove", function (e) {
if (rightClickOpen) {
e.preventDefault();
e.stopPropagation();
return;
}
currentPointerDevice = "Touch";
currentTouchCount = e.touches.length;
var percentX = (e.touches[0].pageX - ScreenViewer.getBoundingClientRect().left) / ScreenViewer.clientWidth;
var percentY = (e.touches[0].pageY - ScreenViewer.getBoundingClientRect().top) / ScreenViewer.clientHeight;
if (e.touches.length == 2) {
var distance1 = Math.hypot(startPinchPoint1.X - e.touches[0].pageX, startPinchPoint1.Y - e.touches[0].pageY);
var distance2 = Math.hypot(startPinchPoint2.X - e.touches[1].pageX, startPinchPoint2.Y - e.touches[1].pageY);
if (distance1 > 5 || distance2 > 5) {
isPinchZooming = true;
}
return;
}
else if (isDragging) {
@ -204,9 +216,8 @@ export function ApplyInputHandlers(sockets) {
}
});
ScreenViewer.addEventListener("touchend", function (e) {
currentPointerDevice = "Touch";
currentTouchCount = e.touches.length;
if (e.touches.length == 1) {
if (e.touches.length == 1 && !isPinchZooming) {
isDragging = true;
var percentX = (e.touches[0].pageX - ScreenViewer.getBoundingClientRect().left) / ScreenViewer.clientWidth;
var percentY = (e.touches[0].pageY - ScreenViewer.getBoundingClientRect().top) / ScreenViewer.clientHeight;
@ -216,7 +227,9 @@ export function ApplyInputHandlers(sockets) {
}
if (currentTouchCount == 0) {
cancelNextClick = false;
rightClickOpen = false;
isPinchZooming = false;
startPinchPoint1 = null;
startPinchPoint2 = null;
}
if (isDragging) {
var percentX = (e.changedTouches[0].pageX - ScreenViewer.getBoundingClientRect().left) / ScreenViewer.clientWidth;
@ -225,6 +238,9 @@ export function ApplyInputHandlers(sockets) {
}
isDragging = false;
});
ScreenViewer.addEventListener("contextmenu", (ev) => {
ev.preventDefault();
});
ScreenViewer.addEventListener("wheel", function (e) {
e.preventDefault();
sockets.SendMouseWheel(e.deltaX, e.deltaY);

2
Remotely_Server/wwwroot/scripts/RemoteControl/UI.js.map
View File

File diff suppressed because one or more lines are too long

69
Remotely_Server/wwwroot/scripts/RemoteControl/UI.ts
View File

@ -3,6 +3,7 @@ import { GetDistanceBetween } from "../Utilities.js";
import { ConnectToClient, RemoteControl } from "./RemoteControl.js";
import { FloatMessage } from "../UI.js";
import { RemoteControlMode } from "../Enums/RemoteControlMode.js";
import { Point } from "../Models/Point.js";
export var SessionIDInput = document.querySelector("#sessionIDInput") as HTMLInputElement;
export var ConnectButton = document.querySelector("#connectButton") as HTMLButtonElement;
@ -22,11 +23,12 @@ export var KeyboardButton = document.getElementById("keyboardButton") as HTMLBut
var lastPointerMove = Date.now();
var isDragging: boolean;
var currentPointerDevice: "Mouse" | "Touch";
var currentPointerDevice: string;
var currentTouchCount: number;
var rightClickOpen: boolean;
var longPressTimer: number;
var cancelNextClick: boolean;
var isPinchZooming: boolean;
var startPinchPoint1: Point;
var startPinchPoint2: Point;
export function ApplyInputHandlers(sockets: RCBrowserSockets) {
document.querySelector("#menuButton").addEventListener("click", (ev) => {
@ -120,8 +122,16 @@ export function ApplyInputHandlers(sockets: RCBrowserSockets) {
document.querySelector("#connectButton").addEventListener("click", (ev) => {
ConnectToClient();
});
ScreenViewer.addEventListener("pointermove", function (e) {
currentPointerDevice = e.pointerType;
});
ScreenViewer.addEventListener("pointerdown", function (e) {
currentPointerDevice = e.pointerType;
});
ScreenViewer.addEventListener("pointerenter", function (e) {
currentPointerDevice = e.pointerType;
});
ScreenViewer.addEventListener("mousemove", function (e) {
currentPointerDevice = "Mouse";
e.preventDefault();
if (Date.now() - lastPointerMove < 25) {
return;
@ -132,6 +142,9 @@ export function ApplyInputHandlers(sockets: RCBrowserSockets) {
sockets.SendMouseMove(percentX, percentY);
});
ScreenViewer.addEventListener("mousedown", function (e) {
if (currentPointerDevice == "touch") {
return;
}
if (e.button != 0 && e.button != 2) {
return;
}
@ -141,6 +154,9 @@ export function ApplyInputHandlers(sockets: RCBrowserSockets) {
sockets.SendMouseDown(e.button, percentX, percentY);
});
ScreenViewer.addEventListener("mouseup", function (e) {
if (currentPointerDevice == "touch") {
return;
}
if (e.button != 0 && e.button != 2) {
return;
}
@ -155,36 +171,35 @@ export function ApplyInputHandlers(sockets: RCBrowserSockets) {
cancelNextClick = false;
return;
}
if (currentPointerDevice == "Mouse") {
if (currentPointerDevice == "mouse") {
e.preventDefault();
e.stopPropagation();
}
else if (currentPointerDevice == "Touch" && currentTouchCount == 0) {
else if (currentPointerDevice == "touch" && currentTouchCount == 0) {
var percentX = e.offsetX / ScreenViewer.clientWidth;
var percentY = e.offsetY / ScreenViewer.clientHeight;
sockets.SendTap(percentX, percentY);
}
});
ScreenViewer.addEventListener("dblclick", function (e) {
if (currentPointerDevice == "mouse") {
return;
}
var percentX = e.offsetX / ScreenViewer.clientWidth;
var percentY = e.offsetY / ScreenViewer.clientHeight;
sockets.SendMouseDown(2, percentX, percentY);
sockets.SendMouseUp(2, percentX, percentY);
});
ScreenViewer.addEventListener("contextmenu", (ev) => {
ev.preventDefault();
});
ScreenViewer.addEventListener("touchstart", function (e) {
if (rightClickOpen) {
e.preventDefault();
e.stopPropagation();
return;
}
if (e.touches.length > 1) {
cancelNextClick = true;
}
if (e.touches.length == 2) {
startPinchPoint1 = { X: e.touches[0].pageX, Y: e.touches[0].pageY, IsEmpty: false };
startPinchPoint2 = { X: e.touches[1].pageX, Y: e.touches[1].pageY, IsEmpty: false };
}
isDragging = false;
currentPointerDevice = "Touch";
currentTouchCount = e.touches.length;
KeyboardButton.removeAttribute("hidden");
var focusedInput = document.querySelector("input:focus") as HTMLInputElement;
@ -194,17 +209,16 @@ export function ApplyInputHandlers(sockets: RCBrowserSockets) {
});
ScreenViewer.addEventListener("touchmove", function (e) {
if (rightClickOpen) {
e.preventDefault();
e.stopPropagation();
return;
}
currentPointerDevice = "Touch";
currentTouchCount = e.touches.length;
var percentX = (e.touches[0].pageX - ScreenViewer.getBoundingClientRect().left) / ScreenViewer.clientWidth;
var percentY = (e.touches[0].pageY - ScreenViewer.getBoundingClientRect().top) / ScreenViewer.clientHeight;
if (e.touches.length == 2) {
var distance1 = Math.hypot(startPinchPoint1.X - e.touches[0].pageX, startPinchPoint1.Y - e.touches[0].pageY);
var distance2 = Math.hypot(startPinchPoint2.X - e.touches[1].pageX, startPinchPoint2.Y - e.touches[1].pageY);
if (distance1 > 5 || distance2 > 5) {
isPinchZooming = true;
}
return;
}
else if (isDragging) {
@ -214,10 +228,9 @@ export function ApplyInputHandlers(sockets: RCBrowserSockets) {
}
});
ScreenViewer.addEventListener("touchend", function (e) {
currentPointerDevice = "Touch";
currentTouchCount = e.touches.length;
if (e.touches.length == 1) {
if (e.touches.length == 1 && !isPinchZooming) {
isDragging = true;
var percentX = (e.touches[0].pageX - ScreenViewer.getBoundingClientRect().left) / ScreenViewer.clientWidth;
var percentY = (e.touches[0].pageY - ScreenViewer.getBoundingClientRect().top) / ScreenViewer.clientHeight;
@ -228,10 +241,11 @@ export function ApplyInputHandlers(sockets: RCBrowserSockets) {
if (currentTouchCount == 0) {
cancelNextClick = false;
rightClickOpen = false;
isPinchZooming = false;
startPinchPoint1 = null;
startPinchPoint2 = null;
}
if (isDragging) {
var percentX = (e.changedTouches[0].pageX - ScreenViewer.getBoundingClientRect().left) / ScreenViewer.clientWidth;
var percentY = (e.changedTouches[0].pageY - ScreenViewer.getBoundingClientRect().top) / ScreenViewer.clientHeight;
@ -239,9 +253,10 @@ export function ApplyInputHandlers(sockets: RCBrowserSockets) {
}
isDragging = false;
});
ScreenViewer.addEventListener("contextmenu", (ev) => {
ev.preventDefault();
});
ScreenViewer.addEventListener("wheel", function (e) {
e.preventDefault();
sockets.SendMouseWheel(e.deltaX, e.deltaY);