Differential D8626 Diff 55690 daemon/backends/upower/ddcutilbrightness.cpp

Changeset View

Standalone View

View Options

daemon/backends/upower/ddcutilbrightness.cpp

Context not available.
20#include <powerdevil_debug.h> 20​#include <powerdevil_debug.h>
21#include "ddcutilbrightness.h" 21​#include "ddcutilbrightness.h"
22 22​
23 ​
24DDCutilBrightness::DDCutilBrightness() 23​DDCutilBrightness::DDCutilBrightness()
24​ : m_usedVcp({0x10})
25{ 25​{
26 m_setBrightnessEventFilter.setInterval(100); 26​ m_setBrightnessEventFilter.setInterval(100);
broulikUnsubmitted
Done

Use initializer:

DDCutilBrightness::DDCUtilBrightness()
    : m_usedVcp({0x10})
broulik: Use initializer: ``` DDCutilBrightness::DDCUtilBrightness() : m_usedVcp({0x10}) ```
27 m_setBrightnessEventFilter.setSingleShot(true); 27​ m_setBrightnessEventFilter.setSingleShot(true);
Context not available.
30 30​
31void DDCutilBrightness::detect() 31​void DDCutilBrightness::detect()
32{ 32​{
33#ifndef WITH_DDCUTIL 33​#ifdef WITH_DDCUTIL
34 qCInfo(POWERDEVIL) << "[DDCutilBrightness] compiled without DDC/CI support"; ​
35 return; ​
36#else ​
37 DDCA_Status rc; 34​ DDCA_Status rc;
38 35​
39 qCDebug(POWERDEVIL) << "Check for monitors using ddca_get_displays()..."; 36​ qCDebug(POWERDEVIL) << "Check for monitors using ddca_get_displays()...";
40 // Inquire about detected monitors. 37​ // Inquire about detected monitors.
41 DDCA_Display_Info_List * dlist = ddca_get_display_info_list(); 38​ DDCA_Display_Info_List * dlist = NULL;
broulikUnsubmitted
Not Done

nullptr

broulik: `nullptr`
42 qCDebug(POWERDEVIL) << "ddca_get_display_info_list() returned "<< dlist; 39​ ddca_get_display_info_list2(true, &dlist);
43 qCInfo(POWERDEVIL) << "[DDCutilBrightness] " << dlist->ct << "display(s) were detected"; 40​ qCInfo(POWERDEVIL) << "[DDCutilBrightness] " << dlist->ct << "display(s) were detected";
44 41​
45 for (int iDisp=0;iDisp<dlist->ct;iDisp++) { 42​ for (int iDisp = 0; iDisp < dlist->ct; ++iDisp) {
46 DDCA_Display_Identifier did; ​
47 DDCA_Display_Ref dref; ​
48 DDCA_Display_Handle dh = nullptr; // initialize to avoid clang analyzer warning 43​ DDCA_Display_Handle dh = nullptr; // initialize to avoid clang analyzer warning
49 44​
50 qCDebug(POWERDEVIL) << "Create a Display Identifier for display"<<iDisp << 45​ qCDebug(POWERDEVIL) << "Create a Display Identifier for display"<<iDisp <<
Context not available.
52 47​
53 m_displayInfoList.append(dlist->info[iDisp]); 48​ m_displayInfoList.append(dlist->info[iDisp]);
54 49​
55 rc = ddca_create_dispno_display_identifier(iDisp+1, &did); // ddcutil uses 1 paded indexing for displays 50​ qCDebug(POWERDEVIL) << "Opening the display reference, creating a display handle...";
56 51​ rc = ddca_open_display2(dlist->info[iDisp].dref, true, &dh);
57 char * did_repr = ddca_did_repr(did); ​
58 ​
59 qCDebug(POWERDEVIL) << "did="<<did_repr; ​
60 ​
61 qCDebug(POWERDEVIL) << "Create a display reference from the display identifier..."; ​
62 rc = ddca_get_display_ref(did, &dref); ​
63 ​
64 if (rc != 0) { ​
65 qCWarning(POWERDEVIL) << "[DDCutilBrightness]: ddct_get_display_ref() returned "<< ​
66 rc<< " ("<<ddca_rc_name(rc) << ​
67 "): "<< ddca_rc_name(rc); ​
68 continue; ​
69 } ​
70 ​
71 char * dref_repr = ddca_dref_repr(dref); ​
72 qCDebug(POWERDEVIL) << "dref= " << dref_repr; ​
73 ​
74 qCDebug(POWERDEVIL) << "Open the display reference, creating a display handle..."; ​
75 rc = ddca_open_display(dref, &dh); ​
76 if (rc != 0) { 52​ if (rc != 0) {
77 qCWarning(POWERDEVIL) << "[DDCutilBrightness]: ddct_open_display"<< rc; 53​ qCWarning(POWERDEVIL) << "[DDCutilBrightness]: ddct_open_display"<< rc;
78 continue; 54​ continue;
79 } 55​ }
80 56​
81 qCDebug(POWERDEVIL) << "adding handle to list"; 57​ DDCA_Feature_List vcpList;
82 m_displayHandleList.append(dh); 58​ ddca_get_feature_list_by_dref(DDCA_SUBSET_COLOR, dh, false, &vcpList);
83 qCDebug(POWERDEVIL) << "handles nb: "<<m_displayHandleList.count(); 59​ qCDebug(POWERDEVIL) << "ddca_feature_list: "<< ddca_feature_list_string(&vcpList, "0x", ",");
84 char* capabilityString; 60​ QVector<uint16_t> tmpVcpList;
85 DDCA_Capabilities* parsedCapabilities; 61​ for (int iVcp = 0; iVcp < m_usedVcp.count(); ++iVcp) {
86 ddca_get_capabilities_string(dh, &capabilityString); 62​ DDCA_Non_Table_Vcp_Value returnValue;
87 ddca_parse_capabilities_string(capabilityString, &parsedCapabilities); 63​ rc = ddca_get_non_table_vcp_value(dh,m_usedVcp.value(iVcp), &returnValue);
broulikUnsubmitted
Done

Coding style:

for (int iVcp = 0; iVcp < m_usedVcp.count(); ++iVcp) {
broulik: Coding style: ``` for (int iVcp = 0; iVcp < m_usedVcp.count(); ++iVcp) { ```
88 qCInfo(POWERDEVIL) << "[DDCutilBrightness] " << parsedCapabilities->vcp_code_ct << "capabilities parsed"; 64​
89 65​ if (rc < 0) {
broulikUnsubmitted
Done

Use .value() instead of operator[] which is const

broulik: Use `.value()` instead of `operator[]` which is const
90 66​ qCDebug(POWERDEVIL) << "[DDCutilBrightness]: This monitor does not seem to support " << m_usedVcp[iVcp];
91 m_descrToVcp_perDisp.append(QMap<QString, int>()); 67​ } else {
92 m_vcpTovcpValueWithDescr_perDisp.append(QMap<int, QMap<int, QString> >() ); 68​ qCDebug(POWERDEVIL) << "[DDCutilBrightness]: This monitor supports " << m_usedVcp[iVcp];
93 //fill the feature description to vcp LUT 69​ tmpVcpList.append(m_usedVcp.value(iVcp));
broulikUnsubmitted
Done

Coding style: Put on same line

} else {
broulik: Coding style: Put on same line ```} else {```
94 70​
95 DDCA_Version_Feature_Info* featureInfo; 71​// if (ddca_feature_list_contains(&vcpList, m_usedVcp.value(iVcp))) {
broulikUnsubmitted
Not Done

Remove commented code

broulik: Remove commented code
96 for (int iVcp=0;iVcp<parsedCapabilities->vcp_code_ct;iVcp++) { 72​// tmpVcpList.append(m_usedVcp.value(iVcp));
97 73​//
98 int vcpCode=parsedCapabilities->vcp_codes[iVcp].feature_code; 74​// }
99 75​// else {
100 m_vcpTovcpValueWithDescr_perDisp[iDisp].insert(vcpCode, QMap<int, QString>()); 76​// qCDebug(POWERDEVIL) << "[DDCutilBrightness]: This monitor does not seem to support " << m_usedVcp[iVcp];
101 ​
102 m_descrToVcp_perDisp[iDisp].insert( ​
103 QString(ddca_get_feature_name(vcpCode)), vcpCode); ​
104 ​
105 ​
106 ddca_get_feature_info_by_display(m_displayHandleList.at(iDisp), vcpCode, &featureInfo); ​
107 if (featureInfo == nullptr) { ​
108 continue; ​
109 } ​
110 qCDebug(POWERDEVIL) << featureInfo->feature_code<<":"<<featureInfo->desc; ​
111 if ((featureInfo->feature_flags & DDCA_SIMPLE_NC) != DDCA_SIMPLE_NC) { ​
112 continue; ​
113 } ​
114 for (int iVcpVal=0;featureInfo->sl_values[iVcpVal].value_code!=0;++iVcpVal) { ​
115 ​
116 qCDebug(POWERDEVIL) << "\t"<<featureInfo->sl_values[iVcpVal].value_code ​
117 <<":"<< featureInfo->sl_values[iVcpVal].value_name; ​
118 ​
119 bool thisVcpValIsSupported=false; ​
120 ​
121 for (int iSupportedVcpVal=0; iSupportedVcpVal<parsedCapabilities->vcp_codes[iVcp].value_ct; iSupportedVcpVal++) { ​
122 if(parsedCapabilities->vcp_codes[iVcp].values[iSupportedVcpVal] ​
123 ==featureInfo->sl_values[iVcpVal].value_code) { ​
124 thisVcpValIsSupported=true; ​
125 } ​
126 } ​
127 ​
128 if (thisVcpValIsSupported) { ​
129 (m_vcpTovcpValueWithDescr_perDisp[iDisp])[vcpCode].insert( ​
130 featureInfo->sl_values[iVcpVal].value_code, ​
131 featureInfo->sl_values[iVcpVal].value_name); ​
132 } ​
133 } 77​ }
134 } 78​ }
135 ddca_free_display_identifier(did); 79​
136 ddca_free_parsed_capabilities(parsedCapabilities); 80​
81​ //we only store displays that actually support the features we want.
82​ if( tmpVcpList.contains(0x10) ) {
broulikUnsubmitted
Not Done

Coding style: if (...) {

broulik: Coding style: `if (...) {`
83​ qCDebug(POWERDEVIL) << "Display supports Brightness, adding handle to list";
84​ m_displayHandleList.append(dh);
broulikUnsubmitted
Done

Leave preprocessor directives unindented

broulik: Leave preprocessor directives unindented
85​ m_supportedVcp_perDisp.value(iDisp).append(tmpVcpList);
86​ }
137 } 87​ }
88​#else
89​ qCInfo(POWERDEVIL) << "[DDCutilBrightness] compiled without DDC/CI support";
90​ return;
138#endif 91​#endif
139} 92​}
140 93​
141 94​
142bool DDCutilBrightness::isSupported() const 95​bool DDCutilBrightness::isSupported() const
143{ 96​{
144#ifndef WITH_DDCUTIL 97​#ifdef WITH_DDCUTIL
145 return false; ​
146#else ​
147 return !m_displayHandleList.isEmpty(); 98​ return !m_displayHandleList.isEmpty();
99​#else
100​ return false;
148#endif 101​#endif
149} 102​}
150 103​
Context not available.
153{ 106​{
154#ifdef WITH_DDCUTIL 107​#ifdef WITH_DDCUTIL
155 //we check whether the timer is running, this means we received new values but did not send them yet to the monitor 108​ //we check whether the timer is running, this means we received new values but did not send them yet to the monitor
156 //not checking that results in the brightness slider jump to the previous vqlue when changing. 109​ //not checking that results in the brightness slider jump to the previous value when changing.
157 if(m_setBrightnessEventFilter.isActive()) { 110​ if (m_setBrightnessEventFilter.isActive()) {
158 m_lastBrightnessKnown = m_tmpCurrentBrightness; 111​ m_lastBrightnessKnown = m_tmpCurrentBrightness;
159 } 112​ } else { //FIXME: gets value for display 1
160 else { //FIXME: gets value for display 1 ​
161 DDCA_Status rc; 113​ DDCA_Status rc;
162 DDCA_Single_Vcp_Value *returnValue; 114​ DDCA_Non_Table_Vcp_Value returnValue;
163 115​
164 rc = ddca_get_vcp_value(m_displayHandleList.at(0), 116​ rc = ddca_get_non_table_vcp_value(m_displayHandleList.at(0),
165 m_descrToVcp_perDisp.at(0).value("Brightness"), 117​ 0x10, &returnValue);
166 DDCA_NON_TABLE_VCP_VALUE, &returnValue); ​
167 qCDebug(POWERDEVIL) << "[DDCutilBrightness::brightness]: ddca_get_vcp_value returned" << rc; 118​ qCDebug(POWERDEVIL) << "[DDCutilBrightness::brightness]: ddca_get_vcp_value returned" << rc;
168 119​
169 //check rc to prevent crash on wake from idle and the monitor has gone to powersave mode 120​ //check rc to prevent crash on wake from idle and the monitor has gone to powersave mode
170 if (rc == 0) { 121​ if (rc == 0) {
171 m_lastBrightnessKnown = (long)returnValue->val.c.cur_val; 122​ m_lastBrightnessKnown = (long)(returnValue.sh <<8|returnValue.sl);
172 } 123​ }
173 } 124​ }
174 return m_lastBrightnessKnown; 125​ return m_lastBrightnessKnown;
Context not available.
181{ 132​{
182#ifdef WITH_DDCUTIL 133​#ifdef WITH_DDCUTIL
183 DDCA_Status rc; 134​ DDCA_Status rc;
184 DDCA_Single_Vcp_Value *returnValue; 135​ DDCA_Non_Table_Vcp_Value returnValue;
185 136​
186 rc = ddca_get_vcp_value(m_displayHandleList.at(0), 137​ rc = ddca_get_non_table_vcp_value(m_displayHandleList.at(0)
187 m_descrToVcp_perDisp.at(0).value("Brightness"), 138​ , 0x10, &returnValue);
188 DDCA_NON_TABLE_VCP_VALUE, &returnValue); ​
189 qCDebug(POWERDEVIL) << "[DDCutilBrightness::brightnessMax]: ddca_get_vcp_value returned" << rc; 139​ qCDebug(POWERDEVIL) << "[DDCutilBrightness::brightnessMax]: ddca_get_vcp_value returned" << rc;
190 140​
191 //check rc to prevent crash on wake from idle and the monitor has gone to powersave mode 141​ //check rc to prevent crash on wake from idle and the monitor has gone to powersave mode
192 if (rc == 0) { 142​ if (rc == 0) {
193 m_lastMaxBrightnessKnown = (long)returnValue->val.c.max_val; 143​ m_lastMaxBrightnessKnown = (long)(returnValue.mh <<8|returnValue.ml);
194 } 144​ }
195 145​
196 return m_lastMaxBrightnessKnown; 146​ return m_lastMaxBrightnessKnown;
Context not available.
210{ 160​{
broulikUnsubmitted
Not Done

Can m_supportedVcp_perDisp be empty? .at(0) will assert if so.

broulik: Can `m_supportedVcp_perDisp` be empty? `.at(0)` will assert if so.
211#ifdef WITH_DDCUTIL 161​#ifdef WITH_DDCUTIL
212 DDCA_Status rc; 162​ DDCA_Status rc;
213 for (int iDisp=0;iDisp<m_displayHandleList.count();iDisp++) { //FIXME: we set the same brightness to all monitors, plugin architecture needed 163​ for (int iDisp = 0; iDisp < m_displayHandleList.count(); ++iDisp) { //FIXME: we set the same brightness to all monitors, plugin architecture needed
214 qCDebug(POWERDEVIL) << "[DDCutilBrightness]: setting brightness "<<m_tmpCurrentBrightness; 164​ qCDebug(POWERDEVIL) << "[DDCutilBrightness]: setting brightness "<<m_tmpCurrentBrightness;
215 rc = ddca_set_continuous_vcp_value(m_displayHandleList.at(iDisp), 165​ uint8_t newsh = (uint16_t)m_tmpCurrentBrightness >> 8;
216 m_descrToVcp_perDisp.at(iDisp).value("Brightness"), 166​ uint8_t newsl = (uint16_t)m_tmpCurrentBrightness & 0x00ff;
217 (int)m_tmpCurrentBrightness); 167​ rc = ddca_set_non_table_vcp_value(m_displayHandleList.at(iDisp), 0x10,
168​ newsh, newsl);
218 169​
219 if (rc != 0) { 170​ if (rc < 0) {
220 qCWarning(POWERDEVIL) << "[DDCutilBrightness::setBrightness] failed, trying to detect()"; 171​ qCWarning(POWERDEVIL) << "[DDCutilBrightness::setBrightness] failed, trying to detect()";
221 detect(); 172​ detect();
222 } else { 173​ } else {
Context not available.