diff options
| author | Ken Moore <ken@ixsystems.com> | 2017-05-23 12:04:34 -0400 |
|---|---|---|
| committer | Ken Moore <ken@ixsystems.com> | 2017-05-23 12:04:34 -0400 |
| commit | 642fafbcf30fcf2887f41ea6d2eff9b63447b32c (patch) | |
| tree | 9c296dddc7124ea3a24267f23949f9e373dc1a3c | |
| parent | Adjust the run_depends of the x11/lumina-core port a bit to try and ensure it... (diff) | |
| download | lumina-642fafbcf30fcf2887f41ea6d2eff9b63447b32c.tar.gz lumina-642fafbcf30fcf2887f41ea6d2eff9b63447b32c.tar.bz2 lumina-642fafbcf30fcf2887f41ea6d2eff9b63447b32c.zip | |
Switch the usage of compton: default to it being disabled rather than enabled (too many false-positives from the GPU acceleration verification routine).
| -rw-r--r-- | src-qt5/core-utils/lumina-config/pages/page_compton.cpp | 2 | ||||
| -rw-r--r-- | src-qt5/core/lumina-session/session.cpp | 17 |
2 files changed, 8 insertions, 11 deletions
diff --git a/src-qt5/core-utils/lumina-config/pages/page_compton.cpp b/src-qt5/core-utils/lumina-config/pages/page_compton.cpp index 4f7b90ae..3b61869f 100644 --- a/src-qt5/core-utils/lumina-config/pages/page_compton.cpp +++ b/src-qt5/core-utils/lumina-config/pages/page_compton.cpp @@ -36,7 +36,7 @@ void page_compton::SaveSettings(){ void page_compton::LoadSettings(int){ emit ChangePageTitle( tr("Window Effects") ); QSettings settings("lumina-desktop","sessionsettings"); - ui->check_disablecompton->setChecked( !settings.value("enableCompositing", true).toBool() ); + ui->check_disablecompton->setChecked( !settings.value("enableCompositing", false).toBool() ); ui->check_GPUverify->setChecked( settings.value("compositingWithGpuAccelOnly", true).toBool() ); QString set = QString(getenv("XDG_CONFIG_HOME"))+"/lumina-desktop/compton.conf"; qDebug() << "Load Compton settings:" << set; diff --git a/src-qt5/core/lumina-session/session.cpp b/src-qt5/core/lumina-session/session.cpp index 2e9433d1..833a6152 100644 --- a/src-qt5/core/lumina-session/session.cpp +++ b/src-qt5/core/lumina-session/session.cpp @@ -114,18 +114,15 @@ void LSession::start(bool unified){ } //Compositing manager QSettings settings("lumina-desktop","sessionsettings"); - if(settings.value("enableCompositing",true).toBool()){ + if(settings.value("enableCompositing",false).toBool()){ if(LUtils::isValidBinary("compton")){ + //Compton available - check the config file QString set = QString(getenv("XDG_CONFIG_HOME"))+"/lumina-desktop/compton.conf"; if(!QFile::exists(set)){ - if(QFile::exists(LOS::LuminaShare()+"/compton.conf")){ - QFile::copy(LOS::LuminaShare()+"/compton.conf", set); - } + if(QFile::exists(LOS::LuminaShare()+"/compton.conf")){ + QFile::copy(LOS::LuminaShare()+"/compton.conf", set); + } } - if(!QFile::exists(set)){ - qDebug() << "Using default compton settings"; - startProcess("compositing","compton"); - }else{ //Auto-detect if GLX is available on the system and turn it on/off as needed bool startcompton = true; if(LUtils::isValidBinary("glxinfo")){ @@ -138,8 +135,8 @@ void LSession::start(bool unified){ LUtils::writeFile(set, info, true); if( !hasAccel && settings.value("compositingWithGpuAccelOnly",true).toBool() ){ startcompton = false; } } - if(startcompton){ startProcess("compositing","compton --config \""+set+"\"", QStringList() << set); } - } + if(startcompton && QFile::exists(set)){ startProcess("compositing","compton --config \""+set+"\"", QStringList() << set); } + else if(startcompton){ startProcess("compositing","compton"); } }else if(LUtils::isValidBinary("xcompmgr") && !settings.value("compositingWithGpuAccelOnly",true).toBool() ){ startProcess("compositing","xcompmgr"); } } } else { |