Respect geometry setting in screen layout
We might only be using part of the X server's screen, so make sure
the layout we calculate is contained within this part.
diff --git a/unix/x0vncserver/XDesktop.cxx b/unix/x0vncserver/XDesktop.cxx
index 5f67f29..f8b579d 100644
--- a/unix/x0vncserver/XDesktop.cxx
+++ b/unix/x0vncserver/XDesktop.cxx
@@ -381,6 +381,20 @@
layout = ::computeScreenLayout(&outputIdMap);
XRRFreeScreenResources(res);
+
+ // Adjust the layout relative to the geometry
+ ScreenSet::iterator iter, iter_next;
+ Point offset(-geometry->offsetLeft(), -geometry->offsetTop());
+ for (iter = layout.begin();iter != layout.end();iter = iter_next) {
+ iter_next = iter; ++iter_next;
+ iter->dimensions = iter->dimensions.translate(offset);
+ if (iter->dimensions.enclosed_by(geometry->getRect()))
+ continue;
+ iter->dimensions = iter->dimensions.intersect(geometry->getRect());
+ if (iter->dimensions.is_empty()) {
+ layout.remove_screen(iter->id);
+ }
+ }
#endif
return layout;