From 117c719c7da24fcc06a1de2e5406d5b8f3634b47 Mon Sep 17 00:00:00 2001 From: Lucas Murray Date: Thu, 15 Jan 2009 09:55:15 +0000 Subject: [PATCH] Merge branch 'fadeeffect' Conflicts: kcmkwin/kwincompositing/main.cpp svn path=/trunk/KDE/kdebase/workspace/; revision=911326 --- effects/CMakeLists.txt | 2 + effects/fadedesktop.cpp | 109 +++++++++++++++++++++++++++++++ effects/fadedesktop.desktop | 17 +++++ effects/fadedesktop.h | 51 +++++++++++++++ kcmkwin/kwincompositing/main.cpp | 16 ++++- 5 files changed, 194 insertions(+), 1 deletion(-) create mode 100644 effects/fadedesktop.cpp create mode 100644 effects/fadedesktop.desktop create mode 100644 effects/fadedesktop.h diff --git a/effects/CMakeLists.txt b/effects/CMakeLists.txt index 33febc6359..c1417d262e 100644 --- a/effects/CMakeLists.txt +++ b/effects/CMakeLists.txt @@ -40,6 +40,7 @@ SET(kwin4_effect_builtins_sources diminactive.cpp dimscreen.cpp fade.cpp + fadedesktop.cpp fallapart.cpp login.cpp logout.cpp @@ -64,6 +65,7 @@ install( FILES diminactive.desktop dimscreen.desktop fade.desktop + fadedesktop.desktop fallapart.desktop login.desktop logout.desktop diff --git a/effects/fadedesktop.cpp b/effects/fadedesktop.cpp new file mode 100644 index 0000000000..fb142b3f15 --- /dev/null +++ b/effects/fadedesktop.cpp @@ -0,0 +1,109 @@ +/******************************************************************** + KWin - the KDE window manager + This file is part of the KDE project. + +Copyright (C) 2009 Lucas Murray + +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, see . +*********************************************************************/ + +#include "fadedesktop.h" + +#include + +namespace KWin +{ + +KWIN_EFFECT( fadedesktop, FadeDesktopEffect ) + +FadeDesktopEffect::FadeDesktopEffect() + : m_fading( false ) + { + m_timeline.setCurveShape( TimeLine::LinearCurve ); + reconfigure( ReconfigureAll ); + } + +void FadeDesktopEffect::reconfigure( ReconfigureFlags ) + { + m_timeline.setDuration( animationTime( 250 )); + } + +void FadeDesktopEffect::prePaintScreen( ScreenPrePaintData &data, int time ) + { + if( m_fading ) + { + m_timeline.addTime( time ); + + // PAINT_SCREEN_BACKGROUND_FIRST is needed because screen will be actually painted more than once, + // so with normal screen painting second screen paint would erase parts of the first paint + if( m_timeline.value() != 1.0 ) + data.mask |= PAINT_SCREEN_TRANSFORMED | PAINT_SCREEN_BACKGROUND_FIRST; + else + { + m_fading = false; + m_timeline.setProgress( 0.0 ); + effects->setActiveFullScreenEffect( NULL ); + } + } + effects->prePaintScreen( data, time ); + } + +void FadeDesktopEffect::postPaintScreen() + { + if( m_fading ) + effects->addRepaintFull(); + effects->postPaintScreen(); + } + +void FadeDesktopEffect::prePaintWindow( EffectWindow *w, WindowPrePaintData &data, int time ) + { + if( m_fading ) + { + if( w->isOnDesktop( m_oldDesktop )) + w->enablePainting( EffectWindow::PAINT_DISABLED_BY_DESKTOP ); + data.setTranslucent(); + } + effects->prePaintWindow( w, data, time ); + } + +void FadeDesktopEffect::paintWindow( EffectWindow *w, int mask, QRegion region, WindowPaintData &data ) + { + if( m_fading && !( w->isOnCurrentDesktop() && w->isOnDesktop( m_oldDesktop ))) + { + if( w->isOnDesktop( m_oldDesktop )) + data.opacity *= 1 - m_timeline.value(); + else + data.opacity *= m_timeline.value(); + } + effects->paintWindow( w, mask, region, data ); + } + +void FadeDesktopEffect::desktopChanged( int old ) + { + if( effects->activeFullScreenEffect() && effects->activeFullScreenEffect() != this ) + return; + + // TODO: Fix glitches when fading while a previous fade is still happening + + effects->setActiveFullScreenEffect( this ); + m_fading = true; + m_timeline.setProgress( 0 ); + m_oldDesktop = old; + + effects->addRepaintFull(); + } + +} // namespace + +#include "fadedesktop.moc" diff --git a/effects/fadedesktop.desktop b/effects/fadedesktop.desktop new file mode 100644 index 0000000000..94f316a9b0 --- /dev/null +++ b/effects/fadedesktop.desktop @@ -0,0 +1,17 @@ +[Desktop Entry] +Name=Fade Desktop +Icon=preferences-system-windows-effect-fadedesktop +Comment=Fade between virtual desktops when switching between them + +Type=Service +X-KDE-ServiceTypes=KWin/Effect +X-KDE-PluginInfo-Author=Lucas Murray +X-KDE-PluginInfo-Email=lmurray@undefinedfire.com +X-KDE-PluginInfo-Name=kwin4_effect_fadedesktop +X-KDE-PluginInfo-Version=0.1.0 +X-KDE-PluginInfo-Category=Appearance +X-KDE-PluginInfo-Depends= +X-KDE-PluginInfo-License=GPL +X-KDE-PluginInfo-EnabledByDefault=false +X-KDE-Library=kwin4_effect_builtins +X-KDE-Ordering=50 diff --git a/effects/fadedesktop.h b/effects/fadedesktop.h new file mode 100644 index 0000000000..9cee7b74de --- /dev/null +++ b/effects/fadedesktop.h @@ -0,0 +1,51 @@ +/******************************************************************** + KWin - the KDE window manager + This file is part of the KDE project. + +Copyright (C) 2009 Lucas Murray + +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, see . +*********************************************************************/ + +#ifndef KWIN_FADEDESKTOP_H +#define KWIN_FADEDESKTOP_H + +#include +#include + +namespace KWin +{ + +class FadeDesktopEffect + : public QObject, public Effect + { + Q_OBJECT + public: + FadeDesktopEffect(); + virtual void reconfigure( ReconfigureFlags ); + virtual void prePaintScreen( ScreenPrePaintData &data, int time ); + virtual void postPaintScreen(); + virtual void prePaintWindow( EffectWindow *w, WindowPrePaintData &data, int time ); + virtual void paintWindow( EffectWindow *w, int mask, QRegion region, WindowPaintData &data ); + virtual void desktopChanged( int old ); + + private: + bool m_fading; + TimeLine m_timeline; + int m_oldDesktop; + }; + +} // namespace + +#endif diff --git a/kcmkwin/kwincompositing/main.cpp b/kcmkwin/kwincompositing/main.cpp index 314fe15173..27ff713016 100644 --- a/kcmkwin/kwincompositing/main.cpp +++ b/kcmkwin/kwincompositing/main.cpp @@ -163,7 +163,7 @@ KWinCompositingConfig::KWinCompositingConfig(QWidget *parent, const QVariantList // search the effect names KServiceTypeTrader* trader = KServiceTypeTrader::self(); KService::List services; - QString boxswitch, presentwindows, coverswitch, flipswitch, slide, cube; + QString boxswitch, presentwindows, coverswitch, flipswitch, slide, cube, fadedesktop; // window switcher services = trader->query("KWin/Effect", "[X-KDE-PluginInfo-Name] == 'kwin4_effect_boxswitch'"); if( !services.isEmpty() ) @@ -184,6 +184,9 @@ KWinCompositingConfig::KWinCompositingConfig(QWidget *parent, const QVariantList services = trader->query("KWin/Effect", "[X-KDE-PluginInfo-Name] == 'kwin4_effect_cube'"); if( !services.isEmpty() ) cube = services.first()->name(); + services = trader->query("KWin/Effect", "[X-KDE-PluginInfo-Name] == 'kwin4_effect_fadedesktop'"); + if( !services.isEmpty() ) + fadedesktop = services.first()->name(); // init the combo boxes ui.windowSwitchingCombo->addItem(i18n("No Effect")); ui.windowSwitchingCombo->addItem(boxswitch); @@ -194,6 +197,7 @@ KWinCompositingConfig::KWinCompositingConfig(QWidget *parent, const QVariantList ui.desktopSwitchingCombo->addItem(i18n("No Effect")); ui.desktopSwitchingCombo->addItem(slide); ui.desktopSwitchingCombo->addItem(cube); + ui.desktopSwitchingCombo->addItem(fadedesktop); } KWinCompositingConfig::~KWinCompositingConfig() @@ -338,6 +342,8 @@ void KWinCompositingConfig::loadGeneralTab() KConfigGroup cubeconfig(mKWinConfig, "Effect-Cube"); if( effectEnabled( "cube", effectconfig ) && cubeconfig.readEntry("AnimateDesktopChange", false)) ui.desktopSwitchingCombo->setCurrentIndex( 2 ); + if( effectEnabled( "fadedesktop", effectconfig )) + ui.desktopSwitchingCombo->setCurrentIndex( 3 ); } bool KWinCompositingConfig::effectEnabled( const QString& effect, const KConfigGroup& cfg ) const @@ -472,16 +478,24 @@ void KWinCompositingConfig::saveGeneralTab() case 0: // no effect effectconfig.writeEntry("kwin4_effect_slideEnabled", false); + effectconfig.writeEntry("kwin4_effect_fadedesktopEnabled", false); break; case 1: // slide effectconfig.writeEntry("kwin4_effect_slideEnabled", true); + effectconfig.writeEntry("kwin4_effect_fadedesktopEnabled", false); break; case 2: // cube cubeDesktopSwitching = true; effectconfig.writeEntry("kwin4_effect_slideEnabled", false); effectconfig.writeEntry("kwin4_effect_cubeEnabled", true); + effectconfig.writeEntry("kwin4_effect_fadedesktopEnabled", false); + break; + case 3: + // fadedesktop + effectconfig.writeEntry("kwin4_effect_slideEnabled", false); + effectconfig.writeEntry("kwin4_effect_fadedesktopEnabled", true); break; } KConfigGroup cubeconfig(mKWinConfig, "Effect-Cube");