summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKimmo Hämäläinen <kimmo.hamalainen@nokia.com>2010-11-04 17:34:32 +0200
committerKimmo Hämäläinen <kimmo.hamalainen@nokia.com>2010-11-04 17:34:32 +0200
commit658b1baedd51082cef57bf09d36c1a5aeb2b04ca (patch)
tree1c41c61fab617b97f2a3afe2363479cb625555ed
parent1dde6f22162af9caf6b45b3f61e348eae97e9b18 (diff)
Redirect root's children right from beginning to avoid double Expose
- agreed with graphics adaptation guys
-rw-r--r--src/mcompositescene.cpp3
-rw-r--r--src/mtexturepixmapitem_p.cpp4
2 files changed, 3 insertions, 4 deletions
diff --git a/src/mcompositescene.cpp b/src/mcompositescene.cpp
index ed4af90..63321d5 100644
--- a/src/mcompositescene.cpp
+++ b/src/mcompositescene.cpp
@@ -67,7 +67,8 @@ void MCompositeScene::prepareRoot()
XSetWindowAttributes sattr;
sattr.event_mask = SubstructureRedirectMask | SubstructureNotifyMask | StructureNotifyMask | PropertyChangeMask;
- //XCompositeRedirectSubwindows (dpy, root, CompositeRedirectAutomatic);
+ // All newly mapped windows should be redirected to avoid double Expose
+ XCompositeRedirectSubwindows(dpy, root, CompositeRedirectManual);
XChangeWindowAttributes(dpy, root, CWEventMask, &sattr);
XSelectInput(dpy, root, SubstructureNotifyMask | SubstructureRedirectMask
diff --git a/src/mtexturepixmapitem_p.cpp b/src/mtexturepixmapitem_p.cpp
index 33a9da4..035ff66 100644
--- a/src/mtexturepixmapitem_p.cpp
+++ b/src/mtexturepixmapitem_p.cpp
@@ -409,14 +409,12 @@ MTexturePixmapPrivate::MTexturePixmapPrivate(Qt::HANDLE window,
textureId(0),
ctextureId(0),
custom_tfp(false),
- direct_fb_render(false),
+ direct_fb_render(false), // root's children start redirected
angle(0),
item(p),
prev_effect(0),
pastDamages(0)
{
- XCompositeRedirectWindow(QX11Info::display(), window,
- CompositeRedirectManual);
if (!glwidget) {
MCompositeManager *m = (MCompositeManager*)qApp;
glwidget = m->glWidget();