crabapples
/
noVNC
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Implement local cursors

This commit is contained in:
Daniel Hammerschmidt 2025-09-17 04:20:33 +02:00
parent 68a2db4da5
commit 4fc3fc91e1
1 changed files with 40 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
core/rfb.js
View File

@ -3087,10 +3087,20 @@ export default class RFB extends EventTargetMixin {
_shouldShowDotCursor() {
// Called when this._cursorImage is updated
if (!this._showDotCursor) {
// User does not want to see the dot, so...
if (!this._showDotCursor && !(this._showLocalCursor && this._localCursors.empty)) {
// User does not want to see the dot or has no local cursor, so...
return false;
}
if (this._showLocalCursor) {
// Do not show the dot in states with a local cursor
if (this._viewportDragging) {
if (this._localCursors.dragging) { return false; }
} else if (this._dragViewport) {
if (this._localCursors.drag) { return false; }
} else if (this._viewOnly) {
if (this._localCursors.viewOnly) { return false; }
}
}
// The dot should not be shown if the cursor is already visible,
// i.e. contains at least one not-fully-transparent pixel.
@ -3112,6 +3122,10 @@ export default class RFB extends EventTargetMixin {
this._rfbConnectionState !== "connected") {
return;
}
if (this._showLocalCursor) {
this._refreshCursorWithLocalCursors();
return;
}
const image = this._shouldShowDotCursor() ? RFB.cursors.dot : this._cursorImage;
this._cursor.change(image.rgbaPixels,
image.hotx, image.hoty,
@ -3119,6 +3133,30 @@ export default class RFB extends EventTargetMixin {
);
}
_refreshCursorWithLocalCursors() {
let image = this._cursorImage;
let localCursor; // = 'none';
if (this._viewportDragging) {
localCursor = this._localCursors.dragging;
} else if (this._dragViewport) {
localCursor = this._localCursors.drag;
} else if (this._viewOnly) {
localCursor = this._localCursors.viewOnly;
// clear locally rendered cursor when switching to view-only whilst connected
image = RFB.cursors.none;
} else if (this._shouldShowDotCursor()) {
localCursor = this._localCursors.empty;
image = this._showDotCursor ? RFB.cursors.dot : this._cursorImage;
} else {
localCursor = this._localCursors.default;
}
this._cursor.change(image.rgbaPixels,
image.hotx, image.hoty,
image.w, image.h,
{ localCursor }
);
}
static genDES(password, challenge) {
const passwordChars = password.split('').map(c => c.charCodeAt(0));
const key = legacyCrypto.importKey(