summaryrefslogtreecommitdiff
path: root/src/privatewindow.h
diff options
context:
space:
mode:
authorSam Spilsbury <sam.spilsbury@canonical.com>2011-04-30 22:07:20 +0800
committerSam Spilsbury <sam.spilsbury@canonical.com>2011-04-30 22:07:20 +0800
commit74e8e9698d8851cfb40c81bd0648dcb56032e34c (patch)
tree0d5da8d8ff4569e39e195f511b792e016fe3be38 /src/privatewindow.h
parentcfd3ef6d29c47f8ac7736dc271d4a04a27e81468 (diff)
downloadmobileperf-74e8e9698d8851cfb40c81bd0648dcb56032e34c.tar.gz
mobileperf-74e8e9698d8851cfb40c81bd0648dcb56032e34c.tar.bz2
Track windows on CreateNotify again, don't rely on trying to beat the race
condition by putting that on MapRequest, instead check at reparent time if the window has already been reparented server-side and don't reparent it again.
Diffstat (limited to 'src/privatewindow.h')
-rw-r--r--src/privatewindow.h21
1 files changed, 9 insertions, 12 deletions
diff --git a/src/privatewindow.h b/src/privatewindow.h
index 2b2d6a4..bbbcb71 100644
--- a/src/privatewindow.h
+++ b/src/privatewindow.h
@@ -46,7 +46,7 @@ typedef CompWindowExtents CompFullscreenMonitorSet;
class PrivateWindow {
public:
- PrivateWindow (CoreWindow *window);
+ PrivateWindow ();
~PrivateWindow ();
void recalcNormalHints ();
@@ -304,24 +304,21 @@ class PrivateWindow {
Time lastCloseRequestTime;
};
-/* Minimal tracking of the window which happens
- * on CreateNotify */
-
class CoreWindow
{
- public:
+public:
- CoreWindow (Window id);
+ CoreWindow (Window id);
- CompWindow * manage (Window above, XWindowAttributes &wa);
+ CompWindow * manage (Window above, XWindowAttributes &wa);
- friend class PrivateWindow;
- friend class PrivateScreen;
- friend class CompScreen;
+ friend class PrivateWindow;
+ friend class PrivateScreen;
+ friend class CompScreen;
- private:
+private:
- PrivateWindow *priv;
+ PrivateWindow *priv;
};
#endif