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

Merge pull request #4 from kasmtech/istouch_bug 

Istouch bug
This commit is contained in:
Kasm 2021-04-22 08:39:10 -04:00 committed by GitHub
parent 10a7fcb91d c02aca5c13
commit 67466077c0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
core/rfb.js
View File

@ -10,7 +10,7 @@
import { toUnsigned32bit, toSigned32bit } from './util/int.js'; import { toUnsigned32bit, toSigned32bit } from './util/int.js';
import * as Log from './util/logging.js'; import * as Log from './util/logging.js';
import { encodeUTF8, decodeUTF8 } from './util/strings.js'; import { encodeUTF8, decodeUTF8 } from './util/strings.js';
import { dragThreshold } from './util/browser.js'; import { dragThreshold, supportsCursorURIs, isTouchDevice } from './util/browser.js';
import { clientToElement } from './util/element.js'; import { clientToElement } from './util/element.js';
import { setCapture } from './util/events.js'; import { setCapture } from './util/events.js';
import EventTargetMixin from './util/eventtarget.js'; import EventTargetMixin from './util/eventtarget.js';
@ -1935,17 +1935,12 @@ export default class RFB extends EventTargetMixin {
if (this.preferBandwidth) // must be last - server processes in reverse order if (this.preferBandwidth) // must be last - server processes in reverse order
encs.push(encodings.pseudoEncodingPreferBandwidth); encs.push(encodings.pseudoEncodingPreferBandwidth);
if (this._fbDepth == 24) { if (supportsCursorURIs && this._fbDepth == 24) {
if (this.preferLocalCursor || !isTouchDevice) {
encs.push(encodings.pseudoEncodingVMwareCursor); encs.push(encodings.pseudoEncodingVMwareCursor);
encs.push(encodings.pseudoEncodingCursor); encs.push(encodings.pseudoEncodingCursor);
} }
//if (supportsCursorURIs() && this._fb_depth == 24){
// Allow the user to attempt using a local cursor even if they are using a touch device. KASM-395
if (this.preferLocalCursor || !isTouchDevice){
encs.push(encodings.pseudoEncodingCursor)
} }
//}
RFB.messages.clientEncodings(this._sock, encs); RFB.messages.clientEncodings(this._sock, encs);
} }