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

Flush mouseMove when initiating viewport dragging 

We want to flush pending mouse moves before we initiate viewport
dragging.

Before this commit, there were scenarios where the _mouseButtonMask
would track a released button as being down.
This commit is contained in:
Adam Halim 2025-01-14 12:32:51 +01:00
parent d1548c12ec
commit 6383fa6384
2 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/rfb.js
View File

@ -1103,6 +1103,8 @@ export default class RFB extends EventTargetMixin {
this._viewportDragPos = {'x': pos.x, 'y': pos.y}; this._viewportDragPos = {'x': pos.x, 'y': pos.y};
this._viewportHasMoved = false; this._viewportHasMoved = false;
this._flushMouseMoveTimer(pos.x, pos.y);
// Skip sending mouse events, instead save the current // Skip sending mouse events, instead save the current
// mouse mask so we can send it later. // mouse mask so we can send it later.
this._mouseButtonMask = bmask; this._mouseButtonMask = bmask;

18
tests/test.rfb.js
View File

@ -898,6 +898,24 @@ describe('Remote Frame Buffer protocol client', function () {
expect(client._display.viewportChangePos).to.not.have.been.called; expect(client._display.viewportChangePos).to.not.have.been.called;
}); });
it('should flush move events when initiating viewport drag', function () {
sendMouseMoveEvent(13, 9, 0x0, client);
sendMouseMoveEvent(14, 9, 0x0, client);
sendMouseButtonEvent(14, 9, true, 0x1, client);
expect(RFB.messages.pointerEvent).to.have.been.calledTwice;
expect(RFB.messages.pointerEvent.firstCall).to.have.been.calledWith(client._sock,
13, 9, 0x0);
expect(RFB.messages.pointerEvent.secondCall).to.have.been.calledWith(client._sock,
14, 9, 0x0);
RFB.messages.pointerEvent.resetHistory();
clock.tick(100);
expect(RFB.messages.pointerEvent).to.not.have.been.called;;
});
}); });
}); });