Differential D5381 Diff 13586 daemon/backends/upower/powerdevilupowerbackend.cpp

Changeset View

Standalone View

View Options

daemon/backends/upower/powerdevilupowerbackend.cpp

Context not available.
38 38​
39#include "xrandrxcbhelper.h" 39​#include "xrandrxcbhelper.h"
40#include "xrandrbrightness.h" 40​#include "xrandrbrightness.h"
41​#include "ddcutilbrightness.h"
41#include "upowersuspendjob.h" 42​#include "upowersuspendjob.h"
42#include "login1suspendjob.h" 43​#include "login1suspendjob.h"
43#include "udevqt.h" 44​#include "udevqt.h"
Context not available.
152 m_upowerInterface = new OrgFreedesktopUPowerInterface(UPOWER_SERVICE, "/org/freedesktop/UPower", QDBusConnection::systemBus(), this); 153​ m_upowerInterface = new OrgFreedesktopUPowerInterface(UPOWER_SERVICE, "/org/freedesktop/UPower", QDBusConnection::systemBus(), this);
153 m_brightnessControl = new XRandrBrightness(); 154​ m_brightnessControl = new XRandrBrightness();
154 if (!m_brightnessControl->isSupported()) { 155​ if (!m_brightnessControl->isSupported()) {
155 qCDebug(POWERDEVIL) << "Falling back to helper to get brightness"; 156​ qCWarning(POWERDEVIL)<<"Xrandr not supported, trying ddc, helper";
156 157​ m_ddcBrightnessControl = new DDCutilBrightness();
157 KAuth::Action brightnessAction("org.kde.powerdevil.backlighthelper.brightness"); 158​ m_ddcBrightnessControl->detect();
158 brightnessAction.setHelperId(HELPER_ID); 159​ if (!m_ddcBrightnessControl->isSupported()) {
159 KAuth::ExecuteJob *brightnessJob = brightnessAction.execute(); 160​ qCDebug(POWERDEVIL) << "Falling back to helper to get brightness";
160 connect(brightnessJob, &KJob::result, this, 161​
161 [this, brightnessJob] { 162​ KAuth::Action brightnessAction("org.kde.powerdevil.backlighthelper.brightness");
162 if (brightnessJob->error()) { 163​ brightnessAction.setHelperId(HELPER_ID);
163 qCWarning(POWERDEVIL) << "org.kde.powerdevil.backlighthelper.brightness failed"; 164​ KAuth::ExecuteJob *brightnessJob = brightnessAction.execute();
164 qCDebug(POWERDEVIL) << brightnessJob->errorText(); 165​ connect(brightnessJob, &KJob::result, this,
165 Q_EMIT brightnessSupportQueried(false); 166​ [this, brightnessJob] {
166 return; 167​ if (brightnessJob->error()) {
167 } 168​ qCWarning(POWERDEVIL) << "org.kde.powerdevil.backlighthelper.brightness failed";
168 m_cachedBrightnessMap.insert(Screen, brightnessJob->data()["brightness"].toFloat()); 169​ qCDebug(POWERDEVIL) << brightnessJob->errorText();
169 170​ Q_EMIT brightnessSupportQueried(false);
170 KAuth::Action brightnessMaxAction("org.kde.powerdevil.backlighthelper.brightnessmax"); 171​ return;
171 brightnessMaxAction.setHelperId(HELPER_ID); 172​ }
172 KAuth::ExecuteJob *brightnessMaxJob = brightnessMaxAction.execute(); 173​ m_cachedBrightnessMap.insert(Screen, brightnessJob->data()["brightness"].toFloat());
173 connect(brightnessMaxJob, &KJob::result, this, 174​
174 [this, brightnessMaxJob] { 175​ KAuth::Action brightnessMaxAction("org.kde.powerdevil.backlighthelper.brightnessmax");
175 if (brightnessMaxJob->error()) { 176​ brightnessMaxAction.setHelperId(HELPER_ID);
176 qCWarning(POWERDEVIL) << "org.kde.powerdevil.backlighthelper.brightnessmax failed"; 177​ KAuth::ExecuteJob *brightnessMaxJob = brightnessMaxAction.execute();
177 qCDebug(POWERDEVIL) << brightnessMaxJob->errorText(); 178​ connect(brightnessMaxJob, &KJob::result, this,
178 } else { 179​ [this, brightnessMaxJob] {
179 m_brightnessMax = brightnessMaxJob->data()["brightnessmax"].toInt(); 180​ if (brightnessMaxJob->error()) {
180 } 181​ qCWarning(POWERDEVIL) << "org.kde.powerdevil.backlighthelper.brightnessmax failed";
181 182​ qCDebug(POWERDEVIL) << brightnessMaxJob->errorText();
182 KAuth::Action syspathAction("org.kde.powerdevil.backlighthelper.syspath"); 183​ } else {
183 syspathAction.setHelperId(HELPER_ID); 184​ m_brightnessMax = brightnessMaxJob->data()["brightnessmax"].toInt();
184 KAuth::ExecuteJob* syspathJob = syspathAction.execute(); 185​ }
185 connect(syspathJob, &KJob::result, this, ​
186 [this, syspathJob] { ​
187 if (syspathJob->error()) { ​
188 qCWarning(POWERDEVIL) << "org.kde.powerdevil.backlighthelper.syspath failed"; ​
189 qCDebug(POWERDEVIL) << syspathJob->errorText(); ​
190 Q_EMIT brightnessSupportQueried(false); ​
191 return; ​
192 } ​
193 m_syspath = syspathJob->data()["syspath"].toString(); ​
194 m_syspath = QFileInfo(m_syspath).readLink(); ​
195 186​
196 m_isLedBrightnessControl = m_syspath.contains(QLatin1String("/leds/")); 187​ KAuth::Action syspathAction("org.kde.powerdevil.backlighthelper.syspath");
197 if (!m_isLedBrightnessControl) { 188​ syspathAction.setHelperId(HELPER_ID);
198 UdevQt::Client *client = new UdevQt::Client(QStringList("backlight"), this); 189​ KAuth::ExecuteJob* syspathJob = syspathAction.execute();
199 connect(client, SIGNAL(deviceChanged(UdevQt::Device)), SLOT(onDeviceChanged(UdevQt::Device))); 190​ connect(syspathJob, &KJob::result, this,
191​ [this, syspathJob] {
192​ if (syspathJob->error()) {
193​ qCWarning(POWERDEVIL) << "org.kde.powerdevil.backlighthelper.syspath failed";
194​ qCDebug(POWERDEVIL) << syspathJob->errorText();
195​ Q_EMIT brightnessSupportQueried(false);
196​ return;
197​ }
198​ m_syspath = syspathJob->data()["syspath"].toString();
199​ m_syspath = QFileInfo(m_syspath).readLink();
200​
201​ m_isLedBrightnessControl = m_syspath.contains(QLatin1String("/leds/"));
202​ if (!m_isLedBrightnessControl) {
203​ UdevQt::Client *client = new UdevQt::Client(QStringList("backlight"), this);
204​ connect(client, SIGNAL(deviceChanged(UdevQt::Device)), SLOT(onDeviceChanged(UdevQt::Device)));
205​ }
206​
207​ Q_EMIT brightnessSupportQueried(m_brightnessMax > 0);
200 } 208​ }
201 209​ );
202 Q_EMIT brightnessSupportQueried(m_brightnessMax > 0); 210​ syspathJob->start();
203 } 211​ }
204 ); 212​ );
205 syspathJob->start(); 213​ brightnessMaxJob->start();
206 } 214​ }
207 ); 215​ );
208 brightnessMaxJob->start(); 216​ brightnessJob->start();
217​ }
218​ else{
broulikUnsubmitted
Done

Coding style:

} else {
broulik: Coding style: ```} else {```
219​ qCDebug(POWERDEVIL) << "Using DDCutillib";
220​ m_cachedBrightnessMap.insert(Screen, brightness(Screen));
221​
222​ const int duration = PowerDevilSettings::brightnessAnimationDuration();
223​ if (duration > 0 && brightnessMax() >= PowerDevilSettings::brightnessAnimationThreshold()) {
224​ m_brightnessAnimation = new QPropertyAnimation(this);
225​ m_brightnessAnimation->setTargetObject(this);
226​ m_brightnessAnimation->setDuration(duration);
227​ m_brightnessAnimation->setEasingCurve(QEasingCurve::InOutQuad);
228​ connect(m_brightnessAnimation, &QPropertyAnimation::valueChanged, this, &PowerDevilUPowerBackend::animationValueChanged);
229​ connect(m_brightnessAnimation, &QPropertyAnimation::finished, this, &PowerDevilUPowerBackend::slotScreenBrightnessChanged);
209 } 230​ }
210 ); 231​ Q_EMIT brightnessSupportQueried(true);
211 brightnessJob->start(); 232​ }
212 } else { 233​ } else {
213 qCDebug(POWERDEVIL) << "Using XRandR"; 234​ qCDebug(POWERDEVIL) << "Using XRandR";
214 m_randrHelper = XRandRXCBHelper::self(); 235​ m_randrHelper = XRandRXCBHelper::self();
broulikUnsubmitted
Done

Whitespace

broulik: Whitespace
broulikUnsubmitted
Done

Whitespace

broulik: Whitespace
Context not available.
398 //qCDebug(POWERDEVIL) << "Calling xrandr brightness"; 419​ //qCDebug(POWERDEVIL) << "Calling xrandr brightness";
399 result = (int) m_brightnessControl->brightness(); 420​ result = (int) m_brightnessControl->brightness();
400 } 421​ }
401 } else { 422​ } else if (m_ddcBrightnessControl->isSupported()){
423​ if (m_brightnessAnimation && m_brightnessAnimation->state() == QPropertyAnimation::Running) {
424​ result = m_brightnessAnimation->endValue().toInt();
425​ } else {
426​ result = (int)m_ddcBrightnessControl->brightness();
427​ }
428​ }else{
402 result = m_cachedBrightnessMap[Screen]; 429​ result = m_cachedBrightnessMap[Screen];
403 } 430​ }
404 qCDebug(POWERDEVIL) << "Screen brightness value: " << result; 431​ qCDebug(POWERDEVIL) << "Screen brightness value: " << result;
Context not available.
418 if (m_brightnessControl->isSupported()) { 445​ if (m_brightnessControl->isSupported()) {
419 //qCDebug(POWERDEVIL) << "Calling xrandr brightness"; 446​ //qCDebug(POWERDEVIL) << "Calling xrandr brightness";
420 result = (int) m_brightnessControl->brightnessMax(); 447​ result = (int) m_brightnessControl->brightnessMax();
421 } else { 448​ } else if (m_ddcBrightnessControl->isSupported()){
449​ result = (int)m_ddcBrightnessControl->brightnessMax();
450​ }else{
422 result = m_brightnessMax; 451​ result = m_brightnessMax;
423 } 452​ }
424 qCDebug(POWERDEVIL) << "Screen brightness value max: " << result; 453​ qCDebug(POWERDEVIL) << "Screen brightness value max: " << result;
Context not available.
445 } else { 474​ } else {
446 m_brightnessControl->setBrightness(value); 475​ m_brightnessControl->setBrightness(value);
447 } 476​ }
477​ } else if (m_ddcBrightnessControl->isSupported()){
478​ if (m_brightnessAnimation) {
479​ m_brightnessAnimation->stop();
480​ disconnect(m_brightnessAnimation, &QPropertyAnimation::valueChanged, this, &PowerDevilUPowerBackend::animationValueChanged);
481​ m_brightnessAnimation->setStartValue(brightness());
482​ m_brightnessAnimation->setEndValue(value);
483​ connect(m_brightnessAnimation, &QPropertyAnimation::valueChanged, this, &PowerDevilUPowerBackend::animationValueChanged);
484​ m_brightnessAnimation->start();
485​ } else {
486​ m_ddcBrightnessControl->setBrightness((long)value);
487​ }
448 } else { 488​ } else {
449 //qCDebug(POWERDEVIL) << "Falling back to helper to set brightness"; 489​ //qCDebug(POWERDEVIL) << "Falling back to helper to set brightness";
450 KAuth::Action action("org.kde.powerdevil.backlighthelper.setbrightness"); 490​ KAuth::Action action("org.kde.powerdevil.backlighthelper.setbrightness");
Context not available.
471 } 511​ }
472 512​
473 int value = brightness(Screen); 513​ int value = brightness(Screen);
474 qCDebug(POWERDEVIL) << "Brightness changed!!"; ​
475 if (value != m_cachedBrightnessMap[Screen] || m_isLedBrightnessControl) { 514​ if (value != m_cachedBrightnessMap[Screen] || m_isLedBrightnessControl) {
476 m_cachedBrightnessMap[Screen] = value; 515​ m_cachedBrightnessMap[Screen] = value;
477 onBrightnessChanged(Screen, value, brightnessMax(Screen)); 516​ onBrightnessChanged(Screen, value, brightnessMax(Screen));
Context not available.
674 713​
675void PowerDevilUPowerBackend::animationValueChanged(const QVariant &value) 714​void PowerDevilUPowerBackend::animationValueChanged(const QVariant &value)
676{ 715​{
677 m_brightnessControl->setBrightness(value.toInt()); 716​ if (m_brightnessControl->isSupported()) {
broulikUnsubmitted
Done

Coding style

if (m_brightnessControl->isSupported()) {
broulik: Coding style ``` if (m_brightnessControl->isSupported()) { ```
717​ m_brightnessControl->setBrightness(value.toInt());
718​ }else if (m_ddcBrightnessControl->isSupported()) {
719​ m_ddcBrightnessControl->setBrightness(value.toInt());
720​ }
721​ else{
722​ qCInfo(POWERDEVIL)<<"PowerDevilUPowerBackend::animationValueChanged: brightness control not supported";
723​ }
678} 724​}
Context not available.