summaryrefslogtreecommitdiff
authorschurig <schurig>2003-06-06 09:13:14 (UTC)
committer schurig <schurig>2003-06-06 09:13:14 (UTC)
commit83ab2890c382631bda4a3ceca649ba70e7a0cebb (patch) (unidiff)
tree6b4f1d7e0601e3ac9c1c31e2be3a42c6de7b80c7
parent8be7b050f52d5a5983e76f75b6dfc9bf8f306d4f (diff)
downloadopie-83ab2890c382631bda4a3ceca649ba70e7a0cebb.zip
opie-83ab2890c382631bda4a3ceca649ba70e7a0cebb.tar.gz
opie-83ab2890c382631bda4a3ceca649ba70e7a0cebb.tar.bz2
set contrast as well
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/launcher/screensaver.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/core/launcher/screensaver.cpp b/core/launcher/screensaver.cpp
index 182084d..48770e8 100644
--- a/core/launcher/screensaver.cpp
+++ b/core/launcher/screensaver.cpp
@@ -175,87 +175,89 @@ void OpieScreenSaver::setIntervals ( int dim, int lightoff, int suspend )
175 175
176/** 176/**
177 * Set suspend time. Will read the dim and lcd-off times from the config file. 177 * Set suspend time. Will read the dim and lcd-off times from the config file.
178 * 178 *
179 * @param suspend time in seconds to go into APM suspend, -1 to 179 * @param suspend time in seconds to go into APM suspend, -1 to
180 * read value from config file, 0 to disable 180 * read value from config file, 0 to disable
181 */ 181 */
182void OpieScreenSaver::setInterval ( int interval ) 182void OpieScreenSaver::setInterval ( int interval )
183{ 183{
184 setIntervals ( -1, -1, interval ); 184 setIntervals ( -1, -1, interval );
185} 185}
186 186
187 187
188void OpieScreenSaver::setMode ( int mode ) 188void OpieScreenSaver::setMode ( int mode )
189{ 189{
190 if ( mode > m_disable_suspend ) 190 if ( mode > m_disable_suspend )
191 setInterval ( -1 ); 191 setInterval ( -1 );
192 m_disable_suspend = mode; 192 m_disable_suspend = mode;
193} 193}
194 194
195 195
196/** 196/**
197 * Set display brightness 197 * Set display brightness
198 * 198 *
199 * Get's default values for backlight and light sensor from config file. 199 * Get's default values for backlight, contrast and light sensor from config file.
200 * 200 *
201 * @param bright desired brighness (-1 to use automatic sensor data or value 201 * @param bright desired brighness (-1 to use automatic sensor data or value
202 * from config file, -2 to toggle backlight on and off, -3 to 202 * from config file, -2 to toggle backlight on and off, -3 to
203 * force backlight off) 203 * force backlight off)
204 */ 204 */
205void OpieScreenSaver::setBacklight ( int bright ) 205void OpieScreenSaver::setBacklight ( int bright )
206{ 206{
207 // Read from config 207 // Read from config
208 Config config ( "apm" ); 208 Config config ( "apm" );
209 config. setGroup ( m_on_ac ? "AC" : "Battery" ); 209 config. setGroup ( m_on_ac ? "AC" : "Battery" );
210 m_backlight_normal = config. readNumEntry ( "Brightness", m_on_ac ? 255 : 127 ); 210 m_backlight_normal = config. readNumEntry ( "Brightness", m_on_ac ? 255 : 127 );
211 int contrast = config. readNumEntry ( "Contrast", 127);
211 m_use_light_sensor = config. readBoolEntry ( "LightSensor", false ); 212 m_use_light_sensor = config. readBoolEntry ( "LightSensor", false );
212 213
213 //qDebug ( "setBacklight: %d (norm: %d) (ls: %d)", bright, m_backlight_normal, m_use_light_sensor ? 1 : 0 ); 214 //qDebug ( "setBacklight: %d (norm: %d) (ls: %d)", bright, m_backlight_normal, m_use_light_sensor ? 1 : 0 );
214 215
215 killTimers ( ); 216 killTimers ( );
216 if (( bright < 0 ) && m_use_light_sensor ) { 217 if (( bright < 0 ) && m_use_light_sensor ) {
217 QStringList sl = config. readListEntry ( "LightSensorData", ';' ); 218 QStringList sl = config. readListEntry ( "LightSensorData", ';' );
218 219
219 m_sensordata [LS_SensorMin] = 40; 220 m_sensordata [LS_SensorMin] = 40;
220 m_sensordata [LS_SensorMax] = 215; 221 m_sensordata [LS_SensorMax] = 215;
221 m_sensordata [LS_LightMin] = 1; 222 m_sensordata [LS_LightMin] = 1;
222 m_sensordata [LS_LightMax] = 255; 223 m_sensordata [LS_LightMax] = 255;
223 m_sensordata [LS_Steps] = 12; 224 m_sensordata [LS_Steps] = 12;
224 m_sensordata [LS_Interval] = 2000; 225 m_sensordata [LS_Interval] = 2000;
225 226
226 for ( uint i = 0; i < LS_Count; i++ ) { 227 for ( uint i = 0; i < LS_Count; i++ ) {
227 if ( i < sl. count ( )) 228 if ( i < sl. count ( ))
228 m_sensordata [i] = sl [i]. toInt ( ); 229 m_sensordata [i] = sl [i]. toInt ( );
229 } 230 }
230 if ( m_sensordata [LS_Steps] < 2 ) // sanity check to avoid SIGFPE 231 if ( m_sensordata [LS_Steps] < 2 ) // sanity check to avoid SIGFPE
231 m_sensordata [LS_Steps] = 2; 232 m_sensordata [LS_Steps] = 2;
232 233
233 timerEvent ( 0 ); 234 timerEvent ( 0 );
234 startTimer ( m_sensordata [LS_Interval] ); 235 startTimer ( m_sensordata [LS_Interval] );
235 } 236 }
236 237
237 setBacklightInternal ( bright ); 238 setBacklightInternal ( bright );
239 ODevice::inst ( )-> setDisplayContrast(contrast);
238} 240}
239 241
240 242
241/** 243/**
242 * Internal brightness setting method 244 * Internal brightness setting method
243 * 245 *
244 * Get's default values for backlight and light sensor from config file. 246 * Get's default values for backlight and light sensor from config file.
245 * 247 *
246 * @param bright desired brighness (-1 to use automatic sensor data or value 248 * @param bright desired brighness (-1 to use automatic sensor data or value
247 * from config file, -2 to toggle backlight on and off, -3 to 249 * from config file, -2 to toggle backlight on and off, -3 to
248 * force backlight off) 250 * force backlight off)
249 */ 251 */
250void OpieScreenSaver::setBacklightInternal ( int bright ) 252void OpieScreenSaver::setBacklightInternal ( int bright )
251{ 253{
252 if ( bright == -3 ) { 254 if ( bright == -3 ) {
253 // Forced on 255 // Forced on
254 m_backlight_forcedoff = false; 256 m_backlight_forcedoff = false;
255 bright = -1; 257 bright = -1;
256 } 258 }
257 if ( m_backlight_forcedoff && bright != -2 ) 259 if ( m_backlight_forcedoff && bright != -2 )
258 return ; 260 return ;
259 if ( bright == -2 ) { 261 if ( bright == -2 ) {
260 // Toggle between off and on 262 // Toggle between off and on
261 bright = m_backlight_current ? 0 : -1; 263 bright = m_backlight_current ? 0 : -1;