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

Merge c830126b78 into bc4414f5b1

This commit is contained in:
Rob Oakes 2015-08-06 21:53:40 +00:00
parent bc4414f5b1 c830126b78
commit f47730ef16
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/rfb.js
View File

@ -142,6 +142,7 @@ var RFB;
'onFBResize': function () { }, // onFBResize(rfb, width, height): frame buffer resized 'onFBResize': function () { }, // onFBResize(rfb, width, height): frame buffer resized
'onDesktopName': function () { }, // onDesktopName(rfb, name): desktop name received 'onDesktopName': function () { }, // onDesktopName(rfb, name): desktop name received
'onXvpInit': function () { }, // onXvpInit(version): XVP extensions active for this connection 'onXvpInit': function () { }, // onXvpInit(version): XVP extensions active for this connection
'onInteraction': function () { }, // onInteraction(): Callback invoked on mouse button press or keyboard press
}); });
// main setup // main setup
@ -587,6 +588,7 @@ var RFB;
_handleKeyPress: function (keysym, down) { _handleKeyPress: function (keysym, down) {
if (this._view_only) { return; } // View only, skip keyboard, events if (this._view_only) { return; } // View only, skip keyboard, events
this._onInteraction(); // Interaction callback
this._sock.send(RFB.messages.keyEvent(keysym, down)); this._sock.send(RFB.messages.keyEvent(keysym, down));
}, },
@ -614,6 +616,7 @@ var RFB;
this._mouse_arr = this._mouse_arr.concat( this._mouse_arr = this._mouse_arr.concat(
RFB.messages.pointerEvent(this._display.absX(x), this._display.absY(y), this._mouse_buttonMask)); RFB.messages.pointerEvent(this._display.absX(x), this._display.absY(y), this._mouse_buttonMask));
this._sock.send(this._mouse_arr); this._sock.send(this._mouse_arr);
this._onInteraction();
this._mouse_arr = []; this._mouse_arr = [];
}, },
@ -1254,6 +1257,7 @@ var RFB;
['onFBResize', 'rw', 'func'], // onFBResize(rfb, width, height): frame buffer resized ['onFBResize', 'rw', 'func'], // onFBResize(rfb, width, height): frame buffer resized
['onDesktopName', 'rw', 'func'], // onDesktopName(rfb, name): desktop name received ['onDesktopName', 'rw', 'func'], // onDesktopName(rfb, name): desktop name received
['onXvpInit', 'rw', 'func'], // onXvpInit(version): XVP extensions active for this connection ['onXvpInit', 'rw', 'func'], // onXvpInit(version): XVP extensions active for this connection
['onInteraction', 'rw', 'func'], // onInteraction(): Mouse mutton or keyboard key pressed
]); ]);
RFB.prototype.set_local_cursor = function (cursor) { RFB.prototype.set_local_cursor = function (cursor) {