Hello community, here is the log from the commit of package compiz for openSUSE:Factory checked in at 2012-06-06 16:05:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/compiz (Old) and /work/SRC/openSUSE:Factory/.compiz.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "compiz", Maintainer is "jzh...@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/compiz/compiz.changes 2011-09-28 14:05:33.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.compiz.new/compiz.changes 2012-06-06 16:05:59.000000000 +0200 @@ -2 +2 @@ -Wed Sep 21 19:34:23 UTC 2011 - dims...@opensuse.org +Fri Jun 1 13:17:57 UTC 2012 - cfarr...@suse.com @@ -4,8 +4,3 @@ -- Update to 0.9.5.92.1: - + Fix failure to build from source due to merge failure on the - last release -- Changes from version 0.9.5.92: - + Added GSettings schema generation - + Revised libdecoration interface - + Fixed crashes on shutdown - + Don't unredirect overlay windows until they have been shaped +- license update: HPND and GPL-2.0+ + SPDX format (and the majority of the MIT-like licenses are actually HPND + - see http://www.spdx.org/licenses/HPND) @@ -14 +9 @@ -Tue Aug 23 06:57:15 UTC 2011 - andrea.turr...@gmail.com +Thu May 12 12:00:01 UTC 2012 - k...@gmx.de @@ -16 +11 @@ -- Fixed typos in compiz.spec +- correct the license format @@ -19 +14 @@ -Mon Jun 27 10:05:42 UTC 2011 - dims...@opensuse.org +Thu May 12 12:00:00 UTC 2012 - k...@gmx.de @@ -21,4 +16 @@ -- Remove gnome bits: there seems no plan upstream yet to re-enable - the integration into GNOME desktop. Missing feature is mostly the - keyboard binding sync between gnome and compiz (on the other - hand, both seem to use the same gconf keys by now). +- add xsessions start script to run Compiz-KDE from the display manager @@ -27 +19 @@ -Fri Jun 3 11:11:38 UTC 2011 - dims...@opensuse.org +Thu May 10 12:00:02 UTC 2012 - k...@gmx.de @@ -29 +21 @@ -- Forward to commit f3a17768d665abab97b888d4d6e66f47770c27df +- substitute freeglut with Mesa-demo-x @@ -32 +24 @@ -Wed May 18 21:39:41 UTC 2011 - dims...@opensuse.org +Thu May 10 12:00:01 UTC 2012 - k...@gmx.de @@ -34,2 +26 @@ -- Extend update.sh to extract the version from the git folder and - inject it into the .spec file. +- add build fixes for gcc-4.7.0 @@ -38 +29 @@ -Sun Mar 6 17:48:02 UTC 2011 - dims...@opensuse.org +Fri Jan 6 11:00:41 UTC 2012 - cyber...@opensuse.org @@ -40 +31 @@ -- Drop compiz-kde-w-d.patch: included upstream. +- enable gtk-window-decorator @@ -43 +34 @@ -Sun Mar 6 17:08:57 UTC 2011 - dims...@opensuse.org +Tue Nov 15 12:00:01 UTC 2010 - k...@gmx.de @@ -45 +36 @@ -- Forward to commit 16295397033bee4ace327b6ba48830e844e77b4d +- readd compiz-unmanaged-window-position.patch @@ -48 +39 @@ -Mon Feb 21 15:26:24 CET 2011 - sbra...@suse.cz +Sun Nov 13 12:00:01 UTC 2010 - k...@gmx.de @@ -50 +41,6 @@ -- Added support for translation-update-upstream. +- build with gnome3 +- enable basic plugins as default +- recommend kolor-manager in kde4 component +- recommend compicc +- add compizconfig / ccp plugin +- add proper version to ccp and compicc @@ -53 +49 @@ -Sun Feb 20 16:59:27 UTC 2011 - dims...@opensuse.org +Sat Nov 12 12:00:01 UTC 2010 - k...@gmx.de @@ -55,2 +51,2 @@ -- Add compiz-kde-w-d.patch: bnc#671672: Maximizing Windows doesn't - work any more with latest compiz packages. +- no transparent windows during move +- some other minor changes like skydome @@ -59 +55 @@ -Sat Feb 12 18:14:38 UTC 2011 - dims...@opensuse.org +Mon Oct 03 12:00:01 UTC 2010 - k...@gmx.de @@ -61,114 +57,3 @@ -- Update to commit a493658e055c59226de31406fe622aec3d4a1c6f: - + Fixes bugs: bnc#670124, bnc#670600, bnc#670605.- - -------------------------------------------------------------------- -Fri Jan 21 20:30:21 UTC 2011 - dims...@opensuse.org - -- Forward to commit 7ce34eabf766f9983b5fddda0e1f5e72b6dac330 - -------------------------------------------------------------------- -Mon Nov 8 19:48:09 UTC 2010 - dims...@opensuse.org - -- Update to version 0.9.2.1: - + Critical crasher bugfixes. - -------------------------------------------------------------------- -Mon Nov 8 14:22:30 UTC 2010 - dims...@opensuse.org - -- Add update.sh as a source to the package. The script is used to - ease the automatic updates to latest git snapshots. - -------------------------------------------------------------------- -Sat Nov 6 18:33:09 UTC 2010 - dims...@opensuse.org - -- Update to version 0.9.2: - + Made minimization functions wrappable - + Decorators now get shadow settings from window properties on - the root window and not through gconf, kconfig or dbus - + Allow resizing from the center of the window - + Clean up gtk-window-decorator - + Fixed a number of reparenting bugs. - -------------------------------------------------------------------- -Tue Sep 28 22:16:39 UTC 2010 - dims...@opensuse.org - -- Recommend instead of Require -lang package. - -------------------------------------------------------------------- -Tue Sep 28 20:09:26 UTC 2010 - dims...@opensuse.org - -- Forward to commit 0f9f1cdb8f03cef37643c636cbfc3897e61657f7 - -------------------------------------------------------------------- -Fri Sep 24 12:43:40 UTC 2010 - dims...@opensuse.org - -- Drop compiz-gdk_deprecated.patch: fixed upstream. -- BuildRequires gconf2-devel. - -------------------------------------------------------------------- -Wed Sep 8 02:59:49 CEST 2010 - vu...@opensuse.org - -- Change old-style BuildRequires to pkgconfig() style - BuildRequires for GNOME-related dependencies: - + old-style: gconf2-devel, gnome-control-center-devel, - gnome-desktop-devel, libgnome-window-settings-devel, - libwnck-devel, metacity-devel. - + new-style: gconf-2.0, gnome-desktop-2.0, gnome-keybindings, - gnome-window-settings-2.0, libmetacity-private, libwnck-1.0. -- This will make it easier to switch to GNOME 3 libraries. - -------------------------------------------------------------------- -Sun Sep 5 20:41:09 UTC 2010 - dims...@opensuse.org - -- Add compiz-gdk_deprecated.patch: we currently rely on deprecated - gdkgc symbols. Porting to Cairo has not started yet. - -------------------------------------------------------------------- -Wed Aug 25 21:30:17 UTC 2010 - dims...@opensuse.org - -- Automatic updated to git snapshot. - + Mostly crash fixes -- Fix build for Factory. - -------------------------------------------------------------------- -Tue Jul 6 20:34:35 UTC 2010 - dims...@opensuse.org - -- 0001-Use-dynamic-allocation-for-plugin-class-indexes-and-.patch - added to work around a gcc 4.5 bug. - -------------------------------------------------------------------- -Sun Jul 4 09:00:45 UTC 2010 - dims...@opensuse.org - -- Update to 0.9.0 - + Rewritten core in C++. - + Rewritten plugin APIs. - + Rewritten buildsystem in CMake, supports option code - autogeneration, plugin build dependency handling, amongst other - things. - + Smart wrappable functions, enables saving on otherwise useless - CPU cycles. - + Reparenting window decorations. - + Support for tiled textures and screen sizes larger than - max_texture_size through the use of the copytex plugin. - + Composite and OpenGL based rendering dropped from core, split - into the opengl and composite plugins, which represent a step - towards pluggable rendering backends. - + Ability to run in non composited mode added to - gtk-window-decorator and kde4-window-decorator. - + kde-window-decorator dropped. - + Added KDE plugin to integrate with the QT main loop and create - a KApplication for KCrash support on KDE. - + dbus plugin now uses screen number to identify compiz instance. - + Dropped multi-screen mode, launch compiz on individual screens - instead. - + Shape drawing mode added to annotate plugin. - + Fixed screen updates issue in annotate plugin. - + Added serialization interface, which allows plugins to - save/restore activity states between plugin and compiz reloads. - Serialization info is stored in X11 window properties and is - automatically dropped by the X Server when the window is - destroyed. - + Added compiztoolbox library plugin used by switchers and - screenshot, which provide a simple interface for accessing XDG - and drawing thumbnails. -- Split out a -lang package +- update to 0.8.8 +- unmanaged window position patch does not apply +- openSUSE-11.3 builds Old: ---- 0001-Use-dynamic-allocation-for-plugin-class-indexes-and-.patch compiz.tar.bz2 update.sh New: ---- bug-449168-avoid-independent-output-painting.diff bug-474862-allow-moving-focus-to-fs-window.diff compiz-0.8.8.tar.bz2 compiz-decorator compiz-default-settings.diff compiz-global_Region_define.patch compiz-gtk_widget_visible.patch compiz-java-config-notify.diff compiz-unmanaged-window-position.patch kde-auto-comp.diff kde-compiz.desktop startkde-compiz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ compiz.spec ++++++ ++++ 639 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/compiz/compiz.spec ++++ and /work/SRC/openSUSE:Factory/.compiz.new/compiz.spec ++++++ bug-449168-avoid-independent-output-painting.diff ++++++ Index: compiz-0.8.4/src/display.c =================================================================== --- compiz-0.8.4.orig/src/display.c +++ compiz-0.8.4/src/display.c @@ -1554,7 +1554,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); ++++++ bug-474862-allow-moving-focus-to-fs-window.diff ++++++ Index: compiz-0.8.6/src/screen.c =================================================================== --- compiz-0.8.6.orig/src/screen.c +++ compiz-0.8.6/src/screen.c @@ -2646,6 +2646,7 @@ focusDefaultWindow (CompScreen *s) if (w->type & (CompWindowTypeNormalMask | CompWindowTypeDialogMask | + CompWindowTypeFullscreenMask | CompWindowTypeModalDialogMask)) { if (compareWindowActiveness (focus, w) < 0) ++++++ compiz-decorator ++++++ #!/bin/sh # Starts Compiz Decorator depending on the DE # # Copyright (c) 2007 CyberOrg <cyber...@cyberorg.info> # Based on compiz-manager script by Kristian Lyngstøl <krist...@bohemians.org> # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # # Contributions by: crdlb # COMPIZ_BIN_PATH=/usr/bin/ KWIN=`which kwin` METACITY="/usr/bin/metacity" XFWM="/usr/bin/xfwm" # # Default to gtk/kde(4)-window-decorator # USE_EMERALD="no" DECORATOR="" #Do not leave users without decoration if decorator fails if [ x"$KDE_FULL_SESSION" = x"true" ]; then FALLBACKWM="${KWIN}"; elif [ x"$GNOME_DESKTOP_SESSION_ID" != x"" ]; then FALLBACKWM="${METACITY}"; elif xprop -root _DT_SAVE_MODE | grep ' = \"xfce4\"$' >/dev/null 2>&1; then FALLBACKWM="${XFWM}"; fi FALLBACKWM_OPTIONS=" --replace" # # Set to yes to enable verbose # VERBOSE="yes" # # Echos the arguments if verbose # verbose() { if [ "x$VERBOSE" = "xyes" ]; then printf "$*" fi } # Read configuration from XDG paths if [ -z "$XDG_CONFIG_DIRS" ]; then test -f /etc/xdg/compiz/compiz-manager && . /etc/xdg/compiz/compiz-manager else test -f $XDG_CONFIG_DIRS/compiz/compiz-manager && . $XDG_CONFIG_DIRS/compiz/compiz-manager fi if [ -z "$XDG_CONFIG_HOME" ]; then test -f $HOME/.config/compiz/compiz-manager && . $HOME/.config/compiz/compiz-manager else test -f $XDG_CONFIG_HOME/compiz/compiz-manager && . $XDG_CONFIG_HOME/compiz/compiz-manager fi # start a decorator if [ -x ${COMPIZ_BIN_PATH}emerald ] && [ "$USE_EMERALD" = "yes" ]; then DECORATOR=emerald elif [ -x ${COMPIZ_BIN_PATH}gtk-window-decorator ] && [ -n "$GNOME_DESKTOP_SESSION_ID" ]; then DECORATOR=gtk-window-decorator elif [ -x ${COMPIZ_BIN_PATH}kde4-window-decorator ] && [ x$KDE_SESSION_VERSION = x"4" ]; then DECORATOR=kde4-window-decorator elif [ -x ${COMPIZ_BIN_PATH}kde-window-decorator ] && [ -n "$KDE_FULL_SESSION" ]; then DECORATOR=kde-window-decorator fi # fall back to any decorator that is installed if [ -z "$DECORATOR" ]; then verbose "Couldn't find a perfect decorator match; trying all decorators\n" if [ -x ${COMPIZ_BIN_PATH}emerald ]; then DECORATOR=emerald elif [ -x ${COMPIZ_BIN_PATH}gtk-window-decorator ]; then DECORATOR=gtk-window-decorator elif [ -x ${COMPIZ_BIN_PATH}kde-window-decorator ]; then DECORATOR=kde-window-decorator elif [ -x ${COMPIZ_BIN_PATH}kde4-window-decorator ]; then DECORATOR=kde4-window-decorator fi fi if [ -n "$DECORATOR" ]; then verbose "Starting ${DECORATOR}\n" exec ${COMPIZ_BIN_PATH}$DECORATOR "$@" 1>/dev/null 2>&1 </dev/null else verbose "Found no decorator to start\n" exec $FALLBACKWM $FALLBACKWM_OPTIONS 1>/dev/null 2>&1 </dev/null fi ++++++ compiz-default-settings.diff ++++++ Index: compiz-0.8.4/metadata/core.xml.in.in =================================================================== --- compiz-0.8.4.orig/metadata/core.xml.in.in +++ compiz-0.8.4/metadata/core.xml.in.in @@ -16,7 +16,7 @@ <option name="audible_bell" type="bool"> <_short>Audible Bell</_short> <_long>Audible system beep</_long> - <default>true</default> + <default>false</default> </option> <option name="ignore_hints_when_maximized" type="bool"> <_short>Ignore Hints When Maximized</_short> @@ -38,7 +38,7 @@ <option name="ping_delay" type="int"> <_short>Ping Delay</_short> <_long>Interval between ping messages</_long> - <default>5000</default> + <default>7500</default> <min>1000</min> <max>30000</max> </option> @@ -223,7 +223,7 @@ <option name="lighting" type="bool"> <_short>Lighting</_short> <_long>Use diffuse light when screen is transformed</_long> - <default>true</default> + <default>false</default> </option> <option name="detect_refresh_rate" type="bool"> <_short>Detect Refresh Rate</_short> Index: compiz-0.8.4/metadata/cube.xml.in =================================================================== --- compiz-0.8.4.orig/metadata/cube.xml.in +++ compiz-0.8.4/metadata/cube.xml.in @@ -110,7 +110,7 @@ <type>string</type> <hints>file;image;</hints> <default> - <value>freedesktop</value> + <value>cube-image</value> </default> </option> <option name="adjust_image" type="bool"> @@ -124,7 +124,7 @@ <option name="skydome" type="bool"> <_short>Skydome</_short> <_long>Render skydome</_long> - <default>false</default> + <default>true</default> </option> <option name="skydome_image" type="string"> <_short>Skydome Image</_short> @@ -140,18 +140,18 @@ <_short>Skydome Gradient Start Color</_short> <_long>Color to use for the top color-stop of the skydome-fallback gradient</_long> <default> - <red>0x0d0d</red> - <green>0xb1b1</green> - <blue>0xfdfd</blue> + <red>0xafaf</red> + <green>0xafaf</green> + <blue>0xafaf</blue> </default> </option> <option name="skydome_gradient_end_color" type="color"> <_short>Skydome Gradient End Color</_short> <_long>Color to use for the bottom color-stop of the skydome-fallback gradient</_long> <default> - <red>0xfefe</red> - <green>0xffff</green> - <blue>0xc7c7</blue> + <red>0x7777</red> + <green>0x7777</green> + <blue>0x7777</blue> </default> </option> </subgroup> @@ -161,7 +161,7 @@ <option name="active_opacity" type="float"> <_short>Opacity During Rotation</_short> <_long>Opacity of desktop window during rotation.</_long> - <default>100.0</default> + <default>40.0</default> <min>0.0</min> <max>100.0</max> <precision>1.0</precision> @@ -177,7 +177,7 @@ <option name="transparent_manual_only" type="bool"> <_short>Transparency Only on Mouse Rotate</_short> <_long>Initiates Cube transparency only if rotation is mouse driven.</_long> - <default>true</default> + <default>false</default> </option> </group> </screen> Index: compiz-0.8.4/metadata/decoration.xml.in =================================================================== --- compiz-0.8.4.orig/metadata/decoration.xml.in +++ compiz-0.8.4/metadata/decoration.xml.in @@ -16,7 +16,7 @@ <option name="shadow_radius" type="float"> <_short>Shadow Radius</_short> <_long>Drop shadow radius</_long> - <default>8.0</default> + <default>7.0</default> <min>0.1</min> <max>18.0</max> <precision>0.1</precision> @@ -50,6 +50,7 @@ <option name="command" type="string"> <_short>Command</_short> <_long>Decorator command line that is executed if no decorator is already running</_long> + <default>compiz-decorator --replace</default> </option> <option name="mipmap" type="bool"> <_short>Mipmap</_short> Index: compiz-0.8.4/metadata/resize.xml.in =================================================================== --- compiz-0.8.4.orig/metadata/resize.xml.in +++ compiz-0.8.4/metadata/resize.xml.in @@ -40,7 +40,7 @@ <option name="mode" type="int"> <_short>Default Resize Mode</_short> <_long>Default mode used for window resizing</_long> - <default>0</default> + <default>2</default> <min>0</min> <max>3</max> <desc> diff -aur compiz-0.8.8_orig//metadata/scale.xml.in compiz-0.8.8//metadata/scale.xml.in --- compiz-0.8.8_orig//metadata/scale.xml.in 2010-05-21 13:18:14.000000000 +0200 +++ compiz-0.8.8//metadata/scale.xml.in 2011-11-10 20:26:18.680000010 +0100 @@ -167,7 +167,7 @@ <_long>Selects where windows are scaled if multiple output devices are used.</_long> <min>0</min> <max>1</max> - <default>0</default> + <default>1</default> <desc> <value>0</value> <_name>On current output device</_name> ++++++ compiz-global_Region_define.patch ++++++ --- compiz-0.8.8/kde/window-decorator-kde4/window.cpp.orig 2012-05-10 19:16:32.788000013 +0200 +++ compiz-0.8.8/kde/window-decorator-kde4/window.cpp 2012-05-10 18:33:27.808000014 +0200 @@ -21,6 +21,7 @@ * Author: David Reveman <dav...@novell.com> */ +#include <unistd.h> #include "window.h" #include "decorator.h" #include "options.h" @@ -986,10 +987,10 @@ { Atom atom = Atoms::compizWindowBlurDecor; QRegion topQRegion, bottomQRegion, leftQRegion, rightQRegion; - Region topRegion = NULL; - Region bottomRegion = NULL; - Region leftRegion = NULL; - Region rightRegion = NULL; + ::Region topRegion = NULL; + ::Region bottomRegion = NULL; + ::Region leftRegion = NULL; + ::Region rightRegion = NULL; int size = 0; int w, h; ++++++ compiz-gtk_widget_visible.patch ++++++ >From c717c27311c8cab8e5a8b4a59b1488a484951cce Mon Sep 17 00:00:00 2001 From: Colin Guthrie <g...@colin.guthr.ie> Date: Fri, 12 Mar 2010 23:28:53 +0000 Subject: gtk-decorator: Replace deprecated GTK_WIDGET_VISIBLE symbol --- diff --git a/gtk/window-decorator/gtk-window-decorator.c b/gtk/window-decorator/gtk-window-decorator.c index 61e60f7..18b907e 100644 --- a/gtk/window-decorator/gtk-window-decorator.c +++ b/gtk/window-decorator/gtk-window-decorator.c @@ -4233,7 +4233,7 @@ show_tooltip (const char *text) static void hide_tooltip (void) { - if (GTK_WIDGET_VISIBLE (tip_window)) + if (gtk_widget_get_visible (tip_window)) g_get_current_time (&tooltip_last_popdown); gtk_widget_hide (tip_window); -- cgit v0.8.3.1-30-gff3a ++++++ compiz-java-config-notify.diff ++++++ Index: compiz-0.8.4/src/window.c =================================================================== --- compiz-0.8.4.orig/src/window.c +++ compiz-0.8.4/src/window.c @@ -3577,6 +3577,10 @@ reconfigureXWindow (CompWindow *w, if (w->frame && (valueMask & (CWSibling | CWStackMode))) XConfigureWindow (w->screen->display->display, w->frame, valueMask & (CWSibling | CWStackMode), xwc); + + if (valueMask & (CWX | CWY)) + if (w->resName && strncmp (w->resName, "sun-awt-X11", 11) == 0) + sendConfigureNotify (w); } static Bool ++++++ compiz-unmanaged-window-position.patch ++++++ Index: compiz-0.8.6/src/event.c =================================================================== --- compiz-0.8.6.orig/src/event.c +++ compiz-0.8.6/src/event.c @@ -2042,11 +2042,11 @@ handleEvent (CompDisplay *d, XWindowChanges xwc; unsigned int xwcm, source; - /* adjust for gravity */ + /* adjust for gravity, but only for frame size */ xwc.x = w->serverX; xwc.y = w->serverY; - xwc.width = w->serverWidth; - xwc.height = w->serverHeight; + xwc.width = 0; + xwc.height = 0; xwcm = adjustConfigureRequestForGravity (w, &xwc, CWX | CWY, Index: compiz-0.8.6/src/window.c =================================================================== --- compiz-0.8.6.orig/src/window.c +++ compiz-0.8.6/src/window.c @@ -2568,8 +2568,8 @@ unmapWindow (CompWindow *w) /* revert gravity adjustment made at MapRequest time */ xwc.x = w->serverX; xwc.y = w->serverY; - xwc.width = w->serverWidth; - xwc.height = w->serverHeight; + xwc.width = 0; + xwc.height = 0; xwcm = adjustConfigureRequestForGravity (w, &xwc, CWX | CWY, ++++++ kde-auto-comp.diff ++++++ Index: compiz-0.8.6/kde/window-decorator-kde4/decorator.cpp =================================================================== --- compiz-0.8.6.orig/kde/window-decorator-kde4/decorator.cpp +++ compiz-0.8.6/kde/window-decorator-kde4/decorator.cpp @@ -83,6 +83,15 @@ KWD::PluginManager::PluginManager (KShar "kwin3_oxygen" : "kwin3_plastik"; } +static int redirectError; + +static int +redirectErrorHandler (Display *dpy, + XErrorEvent *e) +{ + redirectError++; + return 0; +} KWD::Decorator::Decorator () : KApplication (), @@ -164,8 +173,16 @@ KWD::Decorator::Decorator () : XChangeProperty (QX11Info::display(), mCompositeWindow, Atoms::enlightmentDesktop, XA_CARDINAL, 32, PropModeReplace, (unsigned char *) &data, 1); + 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); } Index: compiz-0.8.6/kde/window-decorator/decorator.cpp =================================================================== --- compiz-0.8.6.orig/kde/window-decorator/decorator.cpp +++ compiz-0.8.6/kde/window-decorator/decorator.cpp @@ -188,6 +188,16 @@ dbusHandleMessage (DBusConnection *conne 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) : DCOPO 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); } ++++++ kde-compiz.desktop ++++++ [Desktop Entry] Name=KDE-Compiz Comment=This session logs you into Compiz with KDE Exec=/usr/bin/startkde-compiz TryExec=/usr/bin/compiz-manager Icon= Type=Application ++++++ startkde-compiz ++++++ #!/bin/sh export KDEWM=compiz startkde -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
