diff options
author | Ken Moore <ken@ixsystems.com> | 2018-06-05 10:20:16 -0400 |
---|---|---|
committer | Ken Moore <ken@ixsystems.com> | 2018-06-05 10:20:16 -0400 |
commit | d3944d74e45ffe6abf9c728d575e3c7fe41143e9 (patch) | |
tree | 85cfc47b4eba06ade02e67fed393e7618cf50378 /src-qt5 | |
parent | Began adding Syntax Support for formats to enable/disable spellcheck by default (diff) | |
download | lumina-d3944d74e45ffe6abf9c728d575e3c7fe41143e9.tar.gz lumina-d3944d74e45ffe6abf9c728d575e3c7fe41143e9.tar.bz2 lumina-d3944d74e45ffe6abf9c728d575e3c7fe41143e9.zip |
Add a quick option to allow forcing compositing on when starting up lumina.
Diffstat (limited to 'src-qt5')
-rw-r--r-- | src-qt5/core/lumina-session/session.cpp | 8 | ||||
-rw-r--r-- | src-qt5/core/lumina-session/session.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src-qt5/core/lumina-session/session.cpp b/src-qt5/core/lumina-session/session.cpp index 665b6a40..fe661e30 100644 --- a/src-qt5/core/lumina-session/session.cpp +++ b/src-qt5/core/lumina-session/session.cpp @@ -101,7 +101,7 @@ void LSession::startProcess(QString ID, QString command, QStringList watchfiles) PROCS << proc; } -void LSession::setupCompositor(){ +void LSession::setupCompositor(bool force){ //Compositing manager QSettings settings("lumina-desktop","sessionsettings"); if(settings.value("enableCompositing",false).toBool()){ @@ -126,8 +126,8 @@ void LSession::setupCompositor(){ if( !hasAccel && settings.value("compositingWithGpuAccelOnly",true).toBool() ){ startcompton = false; } } QString disp = getenv("DISPLAY"); - if(startcompton && QFile::exists(set)){ startProcess("compositing","compton -d "+disp+" --config \""+set+"\"", QStringList() << set); } - else if(startcompton){ startProcess("compositing","compton --backend xr_glx_hybrid -d "+disp); } + //if(startcompton && QFile::exists(set)){ startProcess("compositing","compton -d "+disp+" --config \""+set+"\"", QStringList() << set); } + /*else */if(startcompton || force){ startProcess("compositing","compton --backend xr_glx_hybrid -d "+disp); } }else if(LUtils::isValidBinary("xcompmgr") && !settings.value("compositingWithGpuAccelOnly",true).toBool() ){ startProcess("compositing","xcompmgr"); } } } @@ -187,7 +187,7 @@ void LSession::start(bool unified){ if(LUtils::isValidBinary("xscreensaver")){ startProcess("screensaver","xscreensaver -no-splash"); } }else{ //unified process - setupCompositor(); //required for Lumina 2 + setupCompositor(true); //required for Lumina 2 startProcess("runtime","lumina-desktop-unified"); } } diff --git a/src-qt5/core/lumina-session/session.h b/src-qt5/core/lumina-session/session.h index 6f7f8e36..8d61df42 100644 --- a/src-qt5/core/lumina-session/session.h +++ b/src-qt5/core/lumina-session/session.h @@ -63,7 +63,7 @@ private: int wmfails; QTimer *wmTimer; - void setupCompositor(); + void setupCompositor(bool force = false); private slots: void stopall(); |