Skip to content

Bugfix/vnc 212 issue adding monitor #147

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 4 commits into
base: master
Choose a base branch
from
Open

Bugfix/vnc 212 issue adding monitor #147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d9ea4b8
VNC-132 Fix monitor addition bug
quickiwiki Jul 7, 2025
001f0a1
Revert "VNC-132 Fix monitor addition bug"
quickiwiki Jul 7, 2025
f1c6066
VNC-212 Fix monitors addition issue
quickiwiki Jul 8, 2025
878eb43
VNC-212 Determine whether the current window is embedded in a frame o…
quickiwiki Jul 9, 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
35 changes: 23 additions & 12 deletions app/ui.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1458,6 +1458,8 @@ const UI = {
}
url += '/' + path;

UI.monitors = [];
UI.sortedMonitors = [];
UI.rfb = new RFB(document.getElementById('noVNC_container'),
document.getElementById('noVNC_keyboardinput'),
url,
Expand Down Expand Up @@ -1657,6 +1659,8 @@ const UI = {
UI.connected = false;

UI.rfb = undefined;
UI.monitors = [];
UI.sortedMonitors = [];

if (!e.detail.clean) {
UI.updateVisualState('disconnected');
Expand Down Expand Up @@ -1969,11 +1973,13 @@ const UI = {

openDisplays() {
document.getElementById('noVNC_displays').classList.add("noVNC_open");
if (UI.monitors.length < 1 ) {
if (UI.monitors.length < 1 && UI.rfb) {
let screenPlan = UI.rfb.getScreenPlan();
UI.initMonitors(screenPlan)
UI.initMonitors(screenPlan);
}
if (UI.monitors.length > 0) {
UI.displayMonitors()
}
UI.displayMonitors()
},

closeDisplays() {
Expand Down Expand Up @@ -2017,6 +2023,7 @@ const UI = {
let new_display_path = window.location.pathname.replace(/[^/]*$/, '');
const windowId = uuidv4();
let new_display_url = `${window.location.protocol}//${window.location.host}${new_display_path}screen.html?windowId=${windowId}`;
const topWindow = window.top === window.self ? window : window.top || window;

const auto_placement = document.getElementById('noVNC_auto_placement').checked
if (auto_placement && 'getScreenDetails' in window) {
Expand All @@ -2028,8 +2035,8 @@ const UI = {
const details = await window.getScreenDetails()
const current = UI.increaseCurrentDisplay(details)
let screen = details.screens[current]
const options = 'left='+screen.availLeft+',top='+screen.availTop+',width='+screen.availWidth+',height='+screen.availHeight+',fullscreen'
let newdisplay = window.open(new_display_url, '_blank', options);
const options = 'left='+screen.availLeft+',top='+screen.availTop+',width='+screen.availWidth+',height='+screen.availHeight+',fullscreen';
let newdisplay = topWindow.open(new_display_url, '_blank', options);
UI.displayWindows.set(windowId, newdisplay);
return;
}
Expand All @@ -2039,8 +2046,8 @@ const UI = {
}
}

Log.Debug(`Opening a secondary display ${new_display_url}`)
let newdisplay = window.open(new_display_url, '_blank', 'toolbar=0,location=0,menubar=0');
Log.Debug(`Opening a secondary display ${new_display_url}`);
let newdisplay = topWindow.open(new_display_url, '_blank', 'toolbar=0,location=0,menubar=0');
if (newdisplay) {
UI.displayWindows.set(windowId, newdisplay);
}
Expand Down Expand Up @@ -2106,6 +2113,9 @@ const UI = {
recenter() {
const monitors = UI.sortedMonitors
UI.removeSpaces()
if (!monitors.length) {
return;
}
const { startLeft, startTop } = UI.getSizes(monitors)

for (var i = 0; i < monitors.length; i++) {
Expand Down Expand Up @@ -2183,11 +2193,12 @@ const UI = {
},

getSizes(monitors) {
const { canvasWidth, canvasHeight } = UI.multiMonitorSettings()
let top = monitors[0].y
let left = monitors[0].x
let width = monitors[0].w
let height = monitors[0].h
const { canvasWidth, canvasHeight } = UI.multiMonitorSettings();

let top = monitors[0].y;
let left = monitors[0].x;
let width = monitors[0].w;
let height = monitors[0].h;
for (var i = 0; i < monitors.length; i++) {
var m = monitors[i];
if (m.x < left) {
Expand Down
2 changes: 1 addition & 1 deletion core/display.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -473,7 +473,7 @@ export default class Display {
for (let i=1; i<this._screens.length; i++) {
this.screens[i].screenIndex = i;
if (i > 0) {
this._screens[i].channel.postMessage({ eventType: "registered", screenIndex: i });
this._screens[i].channel?.postMessage({ eventType: "registered", screenIndex: i });
}
}
return removed;
Expand Down