From 799cccf444a58ea72c38d19a97c248d46aa96360 Mon Sep 17 00:00:00 2001 From: Jared Goodwin Date: Wed, 20 Mar 2019 19:05:45 -0700 Subject: [PATCH] Added cursor maps. Wrapped UnlockBits in try/catch. --- Remotely_ScreenCast/Capture/ImageUtils.cs | 9 +++++++-- .../wwwroot/scripts/RemoteControl/CursorMap.js | 12 ++++++++++-- .../wwwroot/scripts/RemoteControl/CursorMap.js.map | 2 +- .../wwwroot/scripts/RemoteControl/CursorMap.ts | 12 ++++++++++-- 4 files changed, 28 insertions(+), 7 deletions(-) diff --git a/Remotely_ScreenCast/Capture/ImageUtils.cs b/Remotely_ScreenCast/Capture/ImageUtils.cs index 41d3198f..abb06d21 100644 --- a/Remotely_ScreenCast/Capture/ImageUtils.cs +++ b/Remotely_ScreenCast/Capture/ImageUtils.cs @@ -118,8 +118,13 @@ namespace Remotely_ScreenCast.Capture } catch { - currentFrame.UnlockBits(bd1); - previousFrame.UnlockBits(bd2); + try + { + currentFrame.UnlockBits(bd1); + previousFrame.UnlockBits(bd2); + } + catch { } + return Rectangle.Empty; } } diff --git a/Remotely_Server/wwwroot/scripts/RemoteControl/CursorMap.js b/Remotely_Server/wwwroot/scripts/RemoteControl/CursorMap.js index db400f0c..984bba86 100644 --- a/Remotely_Server/wwwroot/scripts/RemoteControl/CursorMap.js +++ b/Remotely_Server/wwwroot/scripts/RemoteControl/CursorMap.js @@ -3,6 +3,7 @@ export function GetCursor(cursorCode) { console.log("Cursor code " + cursorCode + " is unmapped."); return "default"; } + console.log(`Mapping ${cursorCode} to ${cursorMap[cursorCode]}`); return cursorMap[cursorCode]; } var cursorMap = { @@ -14,7 +15,8 @@ var cursorMap = { "65561": "wait", "65559": "all-scroll", "65553": "ew-resize", - "65557": "ns-resize", + "65557": "all-scroll", + "10029459": "all-scroll", "65551": "nesw-resize", "65555": "ns-resize", "65549": "nwse-resize", @@ -45,6 +47,12 @@ var cursorMap = { "-1670772177": "col-resize", "6883365": "copy", "852495": "col-resize", - "395343": "col-resize" + "395343": "col-resize", + "12453413": "alias", + "8128649": "alias", + "16058911": "alias", + "78839971": "cell", + "37684533": "cell", + "54069687": "cell" }; //# sourceMappingURL=CursorMap.js.map \ No newline at end of file diff --git a/Remotely_Server/wwwroot/scripts/RemoteControl/CursorMap.js.map b/Remotely_Server/wwwroot/scripts/RemoteControl/CursorMap.js.map index 407bfafb..ff3fece7 100644 --- a/Remotely_Server/wwwroot/scripts/RemoteControl/CursorMap.js.map +++ b/Remotely_Server/wwwroot/scripts/RemoteControl/CursorMap.js.map @@ -1 +1 @@ -{"version":3,"file":"CursorMap.js","sourceRoot":"","sources":["CursorMap.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,SAAS,CAAC,UAAkB;IACxC,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,EAAE;QACxB,OAAO,CAAC,GAAG,CAAC,cAAc,GAAG,UAAU,GAAG,eAAe,CAAC,CAAC;QAC3D,OAAO,SAAS,CAAC;KACpB;IACD,OAAO,SAAS,CAAC,UAAU,CAAC,CAAC;AACjC,CAAC;AAED,IAAI,SAAS,GAAG;IACZ,GAAG,EAAE,MAAM;IACX,OAAO,EAAE,MAAM;IACf,OAAO,EAAE,WAAW;IACpB,OAAO,EAAE,MAAM;IACf,OAAO,EAAE,MAAM;IACf,OAAO,EAAE,MAAM;IACf,OAAO,EAAE,YAAY;IACrB,OAAO,EAAE,WAAW;IACpB,OAAO,EAAE,WAAW;IACpB,OAAO,EAAE,aAAa;IACtB,OAAO,EAAE,WAAW;IACpB,OAAO,EAAE,aAAa;IACtB,OAAO,EAAE,SAAS;IAClB,OAAO,EAAE,MAAM;IACf,SAAS,EAAE,YAAY;IACvB,SAAS,EAAE,YAAY;IACvB,QAAQ,EAAE,MAAM;IAChB,QAAQ,EAAE,MAAM;IAChB,QAAQ,EAAE,MAAM;IAChB,QAAQ,EAAE,YAAY;IACtB,QAAQ,EAAE,YAAY;IACtB,QAAQ,EAAE,YAAY;IACtB,QAAQ,EAAE,YAAY;IACtB,QAAQ,EAAE,YAAY;IACtB,QAAQ,EAAE,YAAY;IACtB,QAAQ,EAAE,YAAY;IACtB,OAAO,EAAE,YAAY;IACrB,OAAO,EAAE,SAAS;IAClB,OAAO,EAAE,SAAS;IAClB,OAAO,EAAE,SAAS;IAClB,WAAW,EAAE,YAAY;IACzB,WAAW,EAAE,YAAY;IACzB,UAAU,EAAE,YAAY;IACxB,WAAW,EAAE,YAAY;IACzB,WAAW,EAAE,YAAY;IACzB,WAAW,EAAE,YAAY;IACzB,aAAa,EAAE,YAAY;IAC3B,SAAS,EAAE,MAAM;IACjB,QAAQ,EAAE,YAAY;IACtB,QAAQ,EAAE,YAAY;CACzB,CAAA"} \ No newline at end of file +{"version":3,"file":"CursorMap.js","sourceRoot":"","sources":["CursorMap.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,SAAS,CAAC,UAAkB;IACxC,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,EAAE;QACxB,OAAO,CAAC,GAAG,CAAC,cAAc,GAAG,UAAU,GAAG,eAAe,CAAC,CAAC;QAC3D,OAAO,SAAS,CAAC;KACpB;IACD,OAAO,CAAC,GAAG,CAAC,WAAW,UAAU,OAAO,SAAS,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;IACjE,OAAO,SAAS,CAAC,UAAU,CAAC,CAAC;AACjC,CAAC;AAED,IAAI,SAAS,GAAG;IACZ,GAAG,EAAE,MAAM;IACX,OAAO,EAAE,MAAM;IACf,OAAO,EAAE,WAAW;IACpB,OAAO,EAAE,MAAM;IACf,OAAO,EAAE,MAAM;IACf,OAAO,EAAE,MAAM;IACf,OAAO,EAAE,YAAY;IACrB,OAAO,EAAE,WAAW;IACpB,OAAO,EAAE,YAAY;IACrB,UAAU,EAAE,YAAY;IACxB,OAAO,EAAE,aAAa;IACtB,OAAO,EAAE,WAAW;IACpB,OAAO,EAAE,aAAa;IACtB,OAAO,EAAE,SAAS;IAClB,OAAO,EAAE,MAAM;IACf,SAAS,EAAE,YAAY;IACvB,SAAS,EAAE,YAAY;IACvB,QAAQ,EAAE,MAAM;IAChB,QAAQ,EAAE,MAAM;IAChB,QAAQ,EAAE,MAAM;IAChB,QAAQ,EAAE,YAAY;IACtB,QAAQ,EAAE,YAAY;IACtB,QAAQ,EAAE,YAAY;IACtB,QAAQ,EAAE,YAAY;IACtB,QAAQ,EAAE,YAAY;IACtB,QAAQ,EAAE,YAAY;IACtB,QAAQ,EAAE,YAAY;IACtB,OAAO,EAAE,YAAY;IACrB,OAAO,EAAE,SAAS;IAClB,OAAO,EAAE,SAAS;IAClB,OAAO,EAAE,SAAS;IAClB,WAAW,EAAE,YAAY;IACzB,WAAW,EAAE,YAAY;IACzB,UAAU,EAAE,YAAY;IACxB,WAAW,EAAE,YAAY;IACzB,WAAW,EAAE,YAAY;IACzB,WAAW,EAAE,YAAY;IACzB,aAAa,EAAE,YAAY;IAC3B,SAAS,EAAE,MAAM;IACjB,QAAQ,EAAE,YAAY;IACtB,QAAQ,EAAE,YAAY;IACtB,UAAU,EAAE,OAAO;IACnB,SAAS,EAAE,OAAO;IAClB,UAAU,EAAE,OAAO;IACnB,UAAU,EAAE,MAAM;IAClB,UAAU,EAAE,MAAM;IAClB,UAAU,EAAE,MAAM;CACrB,CAAA"} \ No newline at end of file diff --git a/Remotely_Server/wwwroot/scripts/RemoteControl/CursorMap.ts b/Remotely_Server/wwwroot/scripts/RemoteControl/CursorMap.ts index 35d1cdb5..81fd0798 100644 --- a/Remotely_Server/wwwroot/scripts/RemoteControl/CursorMap.ts +++ b/Remotely_Server/wwwroot/scripts/RemoteControl/CursorMap.ts @@ -3,6 +3,7 @@ console.log("Cursor code " + cursorCode + " is unmapped."); return "default"; } + console.log(`Mapping ${cursorCode} to ${cursorMap[cursorCode]}`); return cursorMap[cursorCode]; } @@ -15,7 +16,8 @@ var cursorMap = { "65561": "wait", "65559": "all-scroll", "65553": "ew-resize", - "65557": "ns-resize", + "65557": "all-scroll", + "10029459": "all-scroll", "65551": "nesw-resize", "65555": "ns-resize", "65549": "nwse-resize", @@ -46,5 +48,11 @@ var cursorMap = { "-1670772177": "col-resize", "6883365": "copy", "852495": "col-resize", - "395343": "col-resize" + "395343": "col-resize", + "12453413": "alias", + "8128649": "alias", + "16058911": "alias", + "78839971": "cell", + "37684533": "cell", + "54069687": "cell" }