Hello community, here is the log from the commit of package compiz for openSUSE:Factory checked in at Fri Feb 6 21:46:12 CET 2009. -------- --- compiz/compiz.changes 2009-01-31 00:24:04.000000000 +0100 +++ compiz/compiz.changes 2009-02-06 19:59:19.000000000 +0100 @@ -1,0 +2,11 @@ +Fri Feb 6 13:46:40 EST 2009 - davidr@novell.com + +- Avoid independent output painting. (bnc#449168) + +------------------------------------------------------------------- +Tue Feb 3 16:41:49 EST 2009 - davidr@novell.com + +- Have KDE decorators use automatic compositing when + manual compositing failed. (bnc#472146) + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- bug-449168-avoid-independent-output-painting.diff kde-auto-comp.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ compiz.spec ++++++ --- /var/tmp/diff_new_pack.n28137/_old 2009-02-06 21:44:22.000000000 +0100 +++ /var/tmp/diff_new_pack.n28137/_new 2009-02-06 21:44:22.000000000 +0100 @@ -41,7 +41,7 @@ %endif AutoReqProv: on Version: 0.7.8 -Release: 20 +Release: 22 Requires: compiz-decorator = %{version} compiz-branding = %{version} Provides: windowmanager Summary: OpenGL window and compositing manager. @@ -64,10 +64,12 @@ Patch10: compiz-kde4-paint-fix.diff Patch11: compiz-missing-translations.patch Patch12: compiz-kde4-decorator-update.patch +Patch13: kde-auto-comp.diff Patch29: gnome-xgl-settings-remove-gconf.diff Patch36: gnome-xgl-settings-hwinfo-primary-display-bno335445.patch Patch60: Mesa-x86_64-fixes.diff Patch61: compiz-place-fix-bnc442052.diff +Patch62: bug-449168-avoid-independent-output-painting.diff Patch80: compiz-0.7.8-NOMAD.diff %if "%(xft-config --prefix)" == "/usr" %define xorg_prefix %_prefix @@ -246,7 +248,9 @@ if [ -f /usr/include/plasma/framesvg.h ] ; then %patch12 -p1 fi +%patch13 -p1 #%patch61 -p1 +%patch62 -p1 cd - %build @@ -423,6 +427,11 @@ %_datadir/compiz/sle.png %changelog +* Fri Feb 06 2009 davidr@novell.com +- Avoid independent output painting. (bnc#449168) +* Tue Feb 03 2009 davidr@novell.com +- Have KDE decorators use automatic compositing when + manual compositing failed. (bnc#472146) * Fri Jan 30 2009 davidr@novell.com - Fix root window clipping issue. (bnc#470020) * Fri Jan 30 2009 davidr@novell.com ++++++ bug-449168-avoid-independent-output-painting.diff ++++++ --- a/src/display.c +++ b/src/display.c @@ -1676,7 +1676,7 @@ eventLoop (void) } if (s->opt[COMP_SCREEN_OPTION_FORCE_INDEPENDENT].value.b - || !s->hasOverlappingOutputs) + && !s->hasOverlappingOutputs) (*s->paintScreen) (s, s->outputDev, s->nOutputDev, mask); ++++++ kde-auto-comp.diff ++++++ --- a/kde/window-decorator-kde4/decorator.cpp +++ b/kde/window-decorator-kde4/decorator.cpp @@ -90,6 +90,15 @@ KWD::PluginManager::PluginManager (KSharedConfigPtr config): "kwin3_oxygen" : "kwin3_plastik"; } +static int redirectError; + +static int +redirectErrorHandler (Display *dpy, + XErrorEvent *e) +{ + redirectError++; + return 0; +} KWD::Decorator::Decorator (Display* display, Qt::HANDLE visual, @@ -169,8 +178,16 @@ KWD::Decorator::Decorator (Display* display, CopyFromParent, CWOverrideRedirect, &attr); + redirectError = 0; + int (*oldErrorHandler) (Display *, XErrorEvent *) = + XSetErrorHandler (redirectErrorHandler); XCompositeRedirectSubwindows (QX11Info::display(), mCompositeWindow, - CompositeRedirectManual); + CompositeRedirectManual); + syncX (); + XSetErrorHandler (oldErrorHandler); + if (redirectError) + XCompositeRedirectSubwindows (QX11Info::display(), mCompositeWindow, + CompositeRedirectAutomatic); XMapWindow (QX11Info::display(), mCompositeWindow); } diff --git a/kde/window-decorator/decorator.cpp b/kde/window-decorator/decorator.cpp index 03819dc..7f630ea 100644 --- a/kde/window-decorator/decorator.cpp +++ b/kde/window-decorator/decorator.cpp @@ -188,6 +188,16 @@ dbusHandleMessage (DBusConnection *connection, return result; } +static int redirectError; + +static int +redirectErrorHandler (Display *dpy, + XErrorEvent *e) +{ + redirectError++; + return 0; +} + KWD::Decorator::Decorator (void) : DCOPObject ("KWinInterface"), KApplication (), mConfig (0), @@ -242,8 +252,16 @@ KWD::Decorator::Decorator (void) : DCOPObject ("KWinInterface"), CopyFromParent, CWOverrideRedirect, &attr); + redirectError = 0; + int (*oldErrorHandler) (Display *, XErrorEvent *) = + XSetErrorHandler (redirectErrorHandler); XCompositeRedirectSubwindows (qt_xdisplay (), mCompositeWindow, CompositeRedirectManual); + syncX (); + XSetErrorHandler (oldErrorHandler); + if (redirectError) + XCompositeRedirectSubwindows (qt_xdisplay (), mCompositeWindow, + CompositeRedirectAutomatic); XMapWindow (qt_xdisplay (), mCompositeWindow); } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org