diff --git a/effects/dimscreen/dimscreen.cpp b/effects/dimscreen/dimscreen.cpp index 3b6147c1b..a7f4f7e4d 100644 --- a/effects/dimscreen/dimscreen.cpp +++ b/effects/dimscreen/dimscreen.cpp @@ -1,115 +1,119 @@ /******************************************************************** KWin - the KDE window manager This file is part of the KDE project. Copyright (C) 2008, 2009 Martin Gräßlin 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 "dimscreen.h" #include +#include + namespace KWin { +static const QSet s_authWindows { + QStringLiteral("kdesu kdesu"), + QStringLiteral("kdesudo kdesudo"), + QStringLiteral("pinentry pinentry"), + QStringLiteral("polkit-kde-authentication-agent-1 polkit-kde-authentication-agent-1"), + QStringLiteral("polkit-kde-manager polkit-kde-manager"), +}; + DimScreenEffect::DimScreenEffect() : mActivated(false) , activateAnimation(false) , deactivateAnimation(false) { reconfigure(ReconfigureAll); connect(effects, SIGNAL(windowActivated(KWin::EffectWindow*)), this, SLOT(slotWindowActivated(KWin::EffectWindow*))); } DimScreenEffect::~DimScreenEffect() { } void DimScreenEffect::reconfigure(ReconfigureFlags) { timeline.setDuration(animationTime(250)); } void DimScreenEffect::prePaintScreen(ScreenPrePaintData& data, int time) { if (mActivated && activateAnimation && !effects->activeFullScreenEffect()) timeline.setCurrentTime(timeline.currentTime() + time); if (mActivated && deactivateAnimation) timeline.setCurrentTime(timeline.currentTime() - time); if (mActivated && effects->activeFullScreenEffect()) timeline.setCurrentTime(timeline.currentTime() - time); if (mActivated && !activateAnimation && !deactivateAnimation && !effects->activeFullScreenEffect() && timeline.currentValue() != 1.0) timeline.setCurrentTime(timeline.currentTime() + time); effects->prePaintScreen(data, time); } void DimScreenEffect::postPaintScreen() { if (mActivated) { if (activateAnimation && timeline.currentValue() == 1.0) { activateAnimation = false; effects->addRepaintFull(); } if (deactivateAnimation && timeline.currentValue() == 0.0) { deactivateAnimation = false; mActivated = false; effects->addRepaintFull(); } // still animating if (timeline.currentValue() > 0.0 && timeline.currentValue() < 1.0) effects->addRepaintFull(); } effects->postPaintScreen(); } void DimScreenEffect::paintWindow(EffectWindow *w, int mask, QRegion region, WindowPaintData &data) { if (mActivated && (w != window) && w->isManaged()) { data.multiplyBrightness((1.0 - 0.33 * timeline.currentValue())); data.multiplySaturation((1.0 - 0.33 * timeline.currentValue())); } effects->paintWindow(w, mask, region, data); } void DimScreenEffect::slotWindowActivated(EffectWindow *w) { if (!w) return; - QStringList check; - check << QStringLiteral("kdesu kdesu"); - check << QStringLiteral("kdesudo kdesudo"); - check << QStringLiteral("polkit-kde-manager polkit-kde-manager"); - check << QStringLiteral("polkit-kde-authentication-agent-1 polkit-kde-authentication-agent-1"); - check << QStringLiteral("pinentry pinentry"); - if (check.contains(w->windowClass())) { + if (s_authWindows.contains(w->windowClass())) { mActivated = true; activateAnimation = true; deactivateAnimation = false; window = w; effects->addRepaintFull(); } else { if (mActivated) { activateAnimation = false; deactivateAnimation = true; effects->addRepaintFull(); } } } bool DimScreenEffect::isActive() const { return mActivated; } } // namespace