Another fullscreen fix: avoid triggering fullscreen simply by setting
the window size to the size of the screen.
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4612 3789f03b-4d11-0410-bbf8-ca57d06f2519
diff --git a/vncviewer/DesktopWindow.cxx b/vncviewer/DesktopWindow.cxx
index a7373ff..6ff631c 100644
--- a/vncviewer/DesktopWindow.cxx
+++ b/vncviewer/DesktopWindow.cxx
@@ -76,8 +76,16 @@
// See comment in DesktopWindow::handleOptions
size_range(100, 100, 0, 0);
fullscreen();
- }
+ } else
#endif
+ {
+ // If we are creating a window which is equal to the size on the
+ // screen on X11, many WMs will treat this as a legacy fullscreen
+ // request. This is not what we want. Besides, it doesn't really
+ // make sense to try to create a window which is larger than the
+ // available work space.
+ size(__rfbmin(w, Fl::w()), __rfbmin(h, Fl::h()));
+ }
show();