Skip to content

KASM-7638 Fix multi-monitor disconnect issue #162

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
quickiwiki wants to merge 2 commits into
base: master
Choose a base branch
from
Open

KASM-7638 Fix multi-monitor disconnect issue #162

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5219ed1
KASM-7638 Fix multi-monitor disconnect issue
quickiwiki Aug 25, 2025
d4fd701
temp message
quickiwiki Aug 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 26 additions & 0 deletions core/constants.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
export const RFB_CHANNEL_EVENTS = {
REGISTER: 'register',
REATTACH: 'reattach',
UNREGISTER: 'unregister',
MOUSEMOVE: 'mousemove',
MOUSEDOWN: 'mousedown',
MOUSEUP: 'mouseup',
SCROLL: 'scroll',
KEY_EVENT: 'keyEvent',
SEND_BINARY_CLIPBOARD: 'sendBinaryClipboard',
UPDATE_CURSOR: 'updateCursor',
RECEIVED_CLIPBOARD: 'receivedClipboard',
DISCONNECT: 'disconnect',
TERMINATE: 'terminate',
APPLY_SETTINGS: 'applySettings',
APPLY_SCREEN_PLAN: 'applyScreenPlan',
SCREEN_REGISTRATION_CONFIRMED: 'screenRegistrationConfirmed'
};

export const ACTIVE_STATE_EVENTS = new Set([
RFB_CHANNEL_EVENTS.MOUSEMOVE,
RFB_CHANNEL_EVENTS.MOUSEDOWN,
RFB_CHANNEL_EVENTS.MOUSEUP,
RFB_CHANNEL_EVENTS.SCROLL,
RFB_CHANNEL_EVENTS.KEY_EVENT,
]);
45 changes: 22 additions & 23 deletions core/rfb.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ import TightDecoder from "./decoders/tight.js";
import TightPNGDecoder from "./decoders/tightpng.js";
import UDPDecoder from './decoders/udp.js';
import { toSignedRelative16bit } from './util/int.js';
import { ACTIVE_STATE_EVENTS, RFB_CHANNEL_EVENTS } from './constants.js';

// How many seconds to wait for a disconnect to finish
const DISCONNECT_TIMEOUT = 3;
Expand Down Expand Up @@ -1808,12 +1809,16 @@ export default class RFB extends EventTargetMixin {
}

_handleControlMessage(event) {
if (event.data?.eventType && ACTIVE_STATE_EVENTS.has(event.data.eventType)) {
this._setLastActive();
}

if (this._isPrimaryDisplay) {
// Secondary to Primary screen message
let size;
let coords;
switch (event.data.eventType) {
case 'register':
case RFB_CHANNEL_EVENTS.REGISTER:
const details = {
...event.data.details,
screenID: event.data.screenID
Expand All @@ -1826,15 +1831,15 @@ export default class RFB extends EventTargetMixin {
this.dispatchEvent(new CustomEvent("screenregistered", { detail: details }));
Log.Info(`Secondary monitor (${event.data.screenID}) has been registered.`);
break;
case 'reattach':
case RFB_CHANNEL_EVENTS.REATTACH:
let changes = this._display.addScreen(event.data.screenID, event.data.width, event.data.height, event.data.pixelRatio, event.data.containerHeight, event.data.containerWidth, event.data.scale, event.data.serverWidth, event.data.serverHeight, event.data.x, event.data.y, event.data.windowId);

clearTimeout(this._resizeTimeout);
this._resizeTimeout = setTimeout(this._requestRemoteResize.bind(this), 500);
this.dispatchEvent(new CustomEvent("screenregistered", {}));
Log.Info(`Secondary monitor (${event.data.screenID}) has been reattached.`);
break;
case 'unregister':
case RFB_CHANNEL_EVENTS.UNREGISTER:
if (this._display.removeScreen(event.data.screenID)) {
this.dispatchEvent(new CustomEvent("screenregistered", {}));
Log.Info(`Secondary monitor (${event.data.screenID}) has been removed.`);
Expand All @@ -1847,7 +1852,7 @@ export default class RFB extends EventTargetMixin {
Log.Info(`Secondary monitor (${event.data.screenID}) not found.`);
}
break;
case 'mousemove':
case RFB_CHANNEL_EVENTS.MOUSEMOVE:
coords = this._display.getServerRelativeCoordinates(event.data.screenIndex, event.data.args[0], event.data.args[1]);
this._mouseLastScreenIndex = event.data.screenIndex;
this._mousePos = { 'x': coords[0], 'y': coords[1] };
Expand All @@ -1864,63 +1869,57 @@ export default class RFB extends EventTargetMixin {
RFB.messages.pointerEvent(this._sock, this._mousePos.x, this._mousePos.y, this._mouseButtonMask);
Log.Debug('Simulated Left Click on secondary display.');
}

this._setLastActive();
break;
case 'mousedown':
case RFB_CHANNEL_EVENTS.MOUSEDOWN:
coords = this._display.getServerRelativeCoordinates(event.data.screenIndex, event.data.args[0], event.data.args[1]);
this._mouseLastScreenIndex = event.data.screenIndex;
this._mousePos = { 'x': coords[0], 'y': coords[1] };
this._mouseButtonMask |= event.data.args[2];
RFB.messages.pointerEvent(this._sock, this._mousePos.x, this._mousePos.y, this._mouseButtonMask);
this._setLastActive();
break;
case 'mouseup':
case RFB_CHANNEL_EVENTS.MOUSEUP:
coords = this._display.getServerRelativeCoordinates(event.data.screenIndex, event.data.args[0], event.data.args[1]);
this._mouseLastScreenIndex = event.data.screenIndex;
this._mousePos = { 'x': coords[0], 'y': coords[1] };
this._mouseButtonMask &= ~event.data.args[2];
RFB.messages.pointerEvent(this._sock, this._mousePos.x, this._mousePos.y, this._mouseButtonMask);
this._setLastActive();
break;
case 'scroll':
case RFB_CHANNEL_EVENTS.SCROLL:
coords = this._display.getServerRelativeCoordinates(event.data.screenIndex, event.data.args[0], event.data.args[1]);
this._mouseLastScreenIndex = event.data.screenIndex;
this._mousePos = { 'x': coords[0], 'y': coords[1] };
RFB.messages.pointerEvent(this._sock, this._mousePos.x, this._mousePos.y, 0, event.data.args[2], event.data.args[3]);
this._setLastActive();
break;
case 'keyEvent':
case RFB_CHANNEL_EVENTS.KEY_EVENT:
RFB.messages.keyEvent(this._sock, ...event.data.args);
this._setLastActive();
break;
case 'sendBinaryClipboard':
case RFB_CHANNEL_EVENTS.SEND_BINARY_CLIPBOARD:
RFB.messages.sendBinaryClipboard(this._sock, ...event.data.args);
break;
// The following are primary to secondary messages that should be ignored on the primary
case 'updateCursor':
case RFB_CHANNEL_EVENTS.UPDATE_CURSOR:
break;
}
} else {
// Primary to secondary screen message
switch (event.data.eventType) {
case 'updateCursor':
case RFB_CHANNEL_EVENTS.UPDATE_CURSOR:
this._updateCursor(...event.data.args);
this._mouseLastScreenIndex = event.data.mouseLastScreenIndex;
break;
case 'receivedClipboard':
case RFB_CHANNEL_EVENTS.RECEIVED_CLIPBOARD:
if (event.data.mouseLastScreenIndex === this._display.screenIndex) {
this._write_binary_clipboard(...event.data.args);
}
break;
case 'disconnect':
case RFB_CHANNEL_EVENTS.DISCONNECT:
this.disconnect();
break;
case 'terminate':
case RFB_CHANNEL_EVENTS.TERMINATE:
this.disconnect();
window.close();
break;
case 'applySettings':
case RFB_CHANNEL_EVENTS.APPLY_SETTINGS:
if (!this._isPrimaryDisplay) {
this.enableHiDpi = event.data.args[0];
this.clipViewport = event.data.args[1];
Expand All @@ -1937,7 +1936,7 @@ export default class RFB extends EventTargetMixin {
}

break;
case 'applyScreenPlan':
case RFB_CHANNEL_EVENTS.APPLY_SCREEN_PLAN:
if (event.data.args[0] == this._display.screenID) {
this._display.screens[0].screenIndex = event.data.args[1];
this._display.screens[0].width = event.data.args[2];
Expand All @@ -1948,7 +1947,7 @@ export default class RFB extends EventTargetMixin {
this.updateConnectionSettings();
}
break;
case 'screenRegistrationConfirmed':
case RFB_CHANNEL_EVENTS.SCREEN_REGISTRATION_CONFIRMED:
if (event.data.args[0] == this._display.screenID) {
this._display.screens[0].screenIndex = event.data.args[1];
}
Expand Down
5 changes: 3 additions & 2 deletions vite.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ export default defineConfig({
ViteRestart({restart: ['core/**', 'app/**','kasmvnc-version.txt']}),
],
build: {
sourcemap: false,
minify: false,
sourcemap: true,
rollupOptions: {
input: {
main: './index.html',
Expand All @@ -28,4 +29,4 @@ export default defineConfig({
}
}
},
})
})