summaryrefslogtreecommitdiff
path: root/src/privatewindow.h
diff options
context:
space:
mode:
authorTravis Watkins <travis.watkins@linaro.org>2011-08-30 08:33:54 -0500
committerTravis Watkins <travis.watkins@linaro.org>2011-08-30 08:33:54 -0500
commit43c84a48550f71455582915c4881241a5e360ec2 (patch)
tree7c0c9cc0c281973694e61118d17840050c5a48b5 /src/privatewindow.h
parent9fd0b94c600a451726e4b2124516afe3d32f13bc (diff)
parent5fbc293d6c63eb3e74f00ffa791b4f4abd3e10c2 (diff)
downloadmobileperf-43c84a48550f71455582915c4881241a5e360ec2.tar.gz
mobileperf-43c84a48550f71455582915c4881241a5e360ec2.tar.bz2
Merge branch 'master' into gles
Conflicts: src/plugin.cpp
Diffstat (limited to 'src/privatewindow.h')
-rw-r--r--src/privatewindow.h19
1 files changed, 15 insertions, 4 deletions
diff --git a/src/privatewindow.h b/src/privatewindow.h
index d1cf73c..a20a01c 100644
--- a/src/privatewindow.h
+++ b/src/privatewindow.h
@@ -36,10 +36,14 @@
#define WINDOW_INVISIBLE(w) \
((w)->attrib.map_state != IsViewable || \
- (w)->attrib.x + (w)->width + (w)->output.right <= 0 || \
- (w)->attrib.y + (w)->height + (w)->output.bottom <= 0 || \
- (w)->attrib.x - (w)->output.left >= (int) screen->width () || \
- (w)->attrib.y - (w)->output.top >= (int) screen->height () )
+ (w)->geometry.x () + (w)->geometry.width () + \
+ (w)->geometry.border () * 2 + (w)->output.right <= 0 || \
+ (w)->geometry.y () + (w)->geometry.height () + \
+ (w)->geometry.border () * 2 + (w)->output.bottom <= 0 || \
+ (w)->geometry.x () - \
+ (w)->output.left >= (int) screen->width () || \
+ (w)->geometry.y () - \
+ (w)->output.top >= (int) screen->height () )
typedef CompWindowExtents CompFullscreenMonitorSet;
@@ -223,6 +227,13 @@ class PrivateWindow {
Window wrapper;
unsigned int mapNum;
unsigned int activeNum;
+
+ /* Don't use this for determining
+ * the window geometry because we
+ * read into this out of sync with
+ * ConfigureNotify events to determine
+ * the class and override redirect state
+ */
XWindowAttributes attrib;
CompWindow::Geometry geometry;
CompWindow::Geometry serverGeometry;