Revision: 4945
http://tigervnc.svn.sourceforge.net/tigervnc/?rev=4945&view=rev
Author: ossman_
Date: 2012-07-20 12:32:52 +0000 (Fri, 20 Jul 2012)
Log Message:
-----------
Make sure we filter out any screens that aren't fully inside the new
framebuffer.
Modified Paths:
--------------
trunk/vncviewer/DesktopWindow.cxx
Modified: trunk/vncviewer/DesktopWindow.cxx
===================================================================
--- trunk/vncviewer/DesktopWindow.cxx 2012-07-20 12:15:32 UTC (rev 4944)
+++ trunk/vncviewer/DesktopWindow.cxx 2012-07-20 12:32:52 UTC (rev 4945)
@@ -489,9 +489,12 @@
int i;
rdr::U32 id;
int sx, sy, sw, sh;
+ Rect fb_rect, screen_rect;
// In full screen we report all screens that are fully covered.
+ fb_rect.setXYWH(x + , 0, width, height);
+
// If we can find a matching screen in the existing set, we use
// that, otherwise we create a brand new screen.
//
@@ -501,6 +504,11 @@
for (i = 0;i < Fl::screen_count();i++) {
Fl::screen_xywh(sx, sy, sw, sh, i);
+ // Check that the screen is fully inside the framebuffer
+ screen_rect.setXYWH(sx, sy, sw, sh);
+ if (!screen_rect.enclosed_by(fb_rect))
+ continue;
+
// Look for perfectly matching existing screen...
for (iter = cc->cp.screenLayout.begin();
iter != cc->cp.screenLayout.end(); ++iter) {
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Tigervnc-commits mailing list
Tigervnc-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tigervnc-commits
