-rw-r--r-- | core/launcher/screensaver.cpp | 4 |
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 | |||
@@ -7,321 +7,323 @@ | |||
7 | 7 | ||
8 | #include <opie/odevice.h> | 8 | #include <opie/odevice.h> |
9 | 9 | ||
10 | 10 | ||
11 | using namespace Opie; | 11 | using namespace Opie; |
12 | 12 | ||
13 | 13 | ||
14 | 14 | ||
15 | OpieScreenSaver::OpieScreenSaver ( ) | 15 | OpieScreenSaver::OpieScreenSaver ( ) |
16 | : QObject ( 0, "screensaver" ), QWSScreenSaver ( ) | 16 | : QObject ( 0, "screensaver" ), QWSScreenSaver ( ) |
17 | { | 17 | { |
18 | m_disable_suspend = 100; | 18 | m_disable_suspend = 100; |
19 | m_enable_dim = false; | 19 | m_enable_dim = false; |
20 | m_enable_lightoff = false; | 20 | m_enable_lightoff = false; |
21 | m_enable_suspend = false; | 21 | m_enable_suspend = false; |
22 | m_onlylcdoff = false; | 22 | m_onlylcdoff = false; |
23 | 23 | ||
24 | m_enable_dim_ac = false; | 24 | m_enable_dim_ac = false; |
25 | m_enable_lightoff_ac = false; | 25 | m_enable_lightoff_ac = false; |
26 | m_enable_suspend_ac = false; | 26 | m_enable_suspend_ac = false; |
27 | m_onlylcdoff_ac = false; | 27 | m_onlylcdoff_ac = false; |
28 | 28 | ||
29 | m_use_light_sensor = false; | 29 | m_use_light_sensor = false; |
30 | m_backlight_sensor = -1; | 30 | m_backlight_sensor = -1; |
31 | ::memset ( m_sensordata, 0xff, LS_Count * sizeof( m_sensordata [0] )); | 31 | ::memset ( m_sensordata, 0xff, LS_Count * sizeof( m_sensordata [0] )); |
32 | 32 | ||
33 | m_lcd_status = true; | 33 | m_lcd_status = true; |
34 | 34 | ||
35 | m_backlight_normal = -1; | 35 | m_backlight_normal = -1; |
36 | m_backlight_current = -1; | 36 | m_backlight_current = -1; |
37 | m_backlight_forcedoff = false; | 37 | m_backlight_forcedoff = false; |
38 | 38 | ||
39 | m_on_ac = false; | 39 | m_on_ac = false; |
40 | 40 | ||
41 | m_level = -1; | 41 | m_level = -1; |
42 | 42 | ||
43 | // Make sure the LCD is in fact on, (if opie was killed while the LCD is off it would still be off) | 43 | // Make sure the LCD is in fact on, (if opie was killed while the LCD is off it would still be off) |
44 | ODevice::inst ( )-> setDisplayStatus ( true ); | 44 | ODevice::inst ( )-> setDisplayStatus ( true ); |
45 | setBacklight ( -1 ); | 45 | setBacklight ( -1 ); |
46 | } | 46 | } |
47 | 47 | ||
48 | 48 | ||
49 | /** | 49 | /** |
50 | * Stops the screen saver | 50 | * Stops the screen saver |
51 | */ | 51 | */ |
52 | void OpieScreenSaver::restore() | 52 | void OpieScreenSaver::restore() |
53 | { | 53 | { |
54 | m_level = -1; | 54 | m_level = -1; |
55 | 55 | ||
56 | if ( !m_lcd_status ) { // We must have turned it off | 56 | if ( !m_lcd_status ) { // We must have turned it off |
57 | ODevice::inst ( ) -> setDisplayStatus ( true ); | 57 | ODevice::inst ( ) -> setDisplayStatus ( true ); |
58 | m_lcd_status = true; | 58 | m_lcd_status = true; |
59 | } | 59 | } |
60 | 60 | ||
61 | setBacklightInternal ( -1 ); | 61 | setBacklightInternal ( -1 ); |
62 | } | 62 | } |
63 | 63 | ||
64 | 64 | ||
65 | /** | 65 | /** |
66 | * Starts the screen saver | 66 | * Starts the screen saver |
67 | * | 67 | * |
68 | * @param level what level of screen saving should happen (0=lowest non-off, 1=off, | 68 | * @param level what level of screen saving should happen (0=lowest non-off, 1=off, |
69 | * 2=suspend whole machine) | 69 | * 2=suspend whole machine) |
70 | * @returns true on success | 70 | * @returns true on success |
71 | */ | 71 | */ |
72 | bool OpieScreenSaver::save( int level ) | 72 | bool OpieScreenSaver::save( int level ) |
73 | { | 73 | { |
74 | m_level = level; | 74 | m_level = level; |
75 | 75 | ||
76 | switch ( level ) { | 76 | switch ( level ) { |
77 | case 0: | 77 | case 0: |
78 | if (( m_on_ac && m_enable_dim_ac ) || | 78 | if (( m_on_ac && m_enable_dim_ac ) || |
79 | ( !m_on_ac && m_enable_dim )) { | 79 | ( !m_on_ac && m_enable_dim )) { |
80 | if (( m_disable_suspend > 0 ) && ( m_backlight_current > 1 ) && !m_use_light_sensor ) | 80 | if (( m_disable_suspend > 0 ) && ( m_backlight_current > 1 ) && !m_use_light_sensor ) |
81 | setBacklightInternal ( 1 ); // lowest non-off | 81 | setBacklightInternal ( 1 ); // lowest non-off |
82 | } | 82 | } |
83 | return true; | 83 | return true; |
84 | break; | 84 | break; |
85 | 85 | ||
86 | case 1: | 86 | case 1: |
87 | if (( m_on_ac && m_enable_lightoff_ac ) || | 87 | if (( m_on_ac && m_enable_lightoff_ac ) || |
88 | ( !m_on_ac && m_enable_lightoff )) { | 88 | ( !m_on_ac && m_enable_lightoff )) { |
89 | if ( m_disable_suspend > 1 ) | 89 | if ( m_disable_suspend > 1 ) |
90 | setBacklightInternal ( 0 ); // off | 90 | setBacklightInternal ( 0 ); // off |
91 | } | 91 | } |
92 | return true; | 92 | return true; |
93 | break; | 93 | break; |
94 | 94 | ||
95 | case 2: | 95 | case 2: |
96 | if (( m_on_ac && !m_enable_suspend_ac ) || | 96 | if (( m_on_ac && !m_enable_suspend_ac ) || |
97 | ( !m_on_ac && !m_enable_suspend )) { | 97 | ( !m_on_ac && !m_enable_suspend )) { |
98 | return true; | 98 | return true; |
99 | } | 99 | } |
100 | 100 | ||
101 | if (( m_on_ac && m_onlylcdoff_ac ) || | 101 | if (( m_on_ac && m_onlylcdoff_ac ) || |
102 | ( !m_on_ac && m_onlylcdoff )) { | 102 | ( !m_on_ac && m_onlylcdoff )) { |
103 | ODevice::inst ( ) -> setDisplayStatus ( false ); | 103 | ODevice::inst ( ) -> setDisplayStatus ( false ); |
104 | m_lcd_status = false; | 104 | m_lcd_status = false; |
105 | return true; | 105 | return true; |
106 | } | 106 | } |
107 | 107 | ||
108 | // We're going to suspend the whole machine | 108 | // We're going to suspend the whole machine |
109 | 109 | ||
110 | if (( m_disable_suspend > 2 ) && !Network::networkOnline ( )) { | 110 | if (( m_disable_suspend > 2 ) && !Network::networkOnline ( )) { |
111 | // TODO: why is this key F34 hard coded? -- schurig | 111 | // TODO: why is this key F34 hard coded? -- schurig |
112 | // Does this now only work an devices with a ODevice::filter? | 112 | // Does this now only work an devices with a ODevice::filter? |
113 | QWSServer::sendKeyEvent( 0xffff, Qt::Key_F34, FALSE, TRUE, FALSE ); | 113 | QWSServer::sendKeyEvent( 0xffff, Qt::Key_F34, FALSE, TRUE, FALSE ); |
114 | return true; | 114 | return true; |
115 | } | 115 | } |
116 | 116 | ||
117 | break; | 117 | break; |
118 | } | 118 | } |
119 | return false; | 119 | return false; |
120 | } | 120 | } |
121 | 121 | ||
122 | 122 | ||
123 | /** | 123 | /** |
124 | * Set intervals in seconds for automatic dimming, light off and suspend | 124 | * Set intervals in seconds for automatic dimming, light off and suspend |
125 | * | 125 | * |
126 | * This function also sets the member variables m_m_enable_dim[_ac], | 126 | * This function also sets the member variables m_m_enable_dim[_ac], |
127 | * m_enable_lightoff[_ac], m_enable_suspend[_ac], m_onlylcdoff[_ac] | 127 | * m_enable_lightoff[_ac], m_enable_suspend[_ac], m_onlylcdoff[_ac] |
128 | * | 128 | * |
129 | * @param dim time in seconds to dim, -1 to read value from config file, | 129 | * @param dim time in seconds to dim, -1 to read value from config file, |
130 | * 0 to disable | 130 | * 0 to disable |
131 | * @param lightoff time in seconds to turn LCD backlight off, -1 to | 131 | * @param lightoff time in seconds to turn LCD backlight off, -1 to |
132 | * read value from config file, 0 to disable | 132 | * read value from config file, 0 to disable |
133 | * @param suspend time in seconds to do an APM suspend, -1 to | 133 | * @param suspend time in seconds to do an APM suspend, -1 to |
134 | * read value from config file, 0 to disable | 134 | * read value from config file, 0 to disable |
135 | */ | 135 | */ |
136 | void OpieScreenSaver::setIntervals ( int dim, int lightoff, int suspend ) | 136 | void OpieScreenSaver::setIntervals ( int dim, int lightoff, int suspend ) |
137 | { | 137 | { |
138 | Config config ( "apm" ); | 138 | Config config ( "apm" ); |
139 | config. setGroup ( m_on_ac ? "AC" : "Battery" ); | 139 | config. setGroup ( m_on_ac ? "AC" : "Battery" ); |
140 | 140 | ||
141 | int v[ 4 ]; | 141 | int v[ 4 ]; |
142 | if ( dim < 0 ) | 142 | if ( dim < 0 ) |
143 | dim = config. readNumEntry ( "Dim", m_on_ac ? 60 : 30 ); | 143 | dim = config. readNumEntry ( "Dim", m_on_ac ? 60 : 30 ); |
144 | if ( lightoff < 0 ) | 144 | if ( lightoff < 0 ) |
145 | lightoff = config. readNumEntry ( "LightOff", m_on_ac ? 120 : 20 ); | 145 | lightoff = config. readNumEntry ( "LightOff", m_on_ac ? 120 : 20 ); |
146 | if ( suspend < 0 ) | 146 | if ( suspend < 0 ) |
147 | suspend = config. readNumEntry ( "Suspend", m_on_ac ? 0 : 60 ); | 147 | suspend = config. readNumEntry ( "Suspend", m_on_ac ? 0 : 60 ); |
148 | 148 | ||
149 | if ( m_on_ac ) { | 149 | if ( m_on_ac ) { |
150 | m_enable_dim_ac = ( dim > 0 ); | 150 | m_enable_dim_ac = ( dim > 0 ); |
151 | m_enable_lightoff_ac = ( lightoff > 0 ); | 151 | m_enable_lightoff_ac = ( lightoff > 0 ); |
152 | m_enable_suspend_ac = ( suspend > 0 ); | 152 | m_enable_suspend_ac = ( suspend > 0 ); |
153 | m_onlylcdoff_ac = config.readBoolEntry ( "LcdOffOnly", false ); | 153 | m_onlylcdoff_ac = config.readBoolEntry ( "LcdOffOnly", false ); |
154 | } | 154 | } |
155 | else { | 155 | else { |
156 | m_enable_dim = ( dim > 0 ); | 156 | m_enable_dim = ( dim > 0 ); |
157 | m_enable_lightoff = ( lightoff > 0 ); | 157 | m_enable_lightoff = ( lightoff > 0 ); |
158 | m_enable_suspend = ( suspend > 0 ); | 158 | m_enable_suspend = ( suspend > 0 ); |
159 | m_onlylcdoff = config.readBoolEntry ( "LcdOffOnly", false ); | 159 | m_onlylcdoff = config.readBoolEntry ( "LcdOffOnly", false ); |
160 | } | 160 | } |
161 | 161 | ||
162 | //qDebug("screen saver intervals: %d %d %d", dim, lightoff, suspend); | 162 | //qDebug("screen saver intervals: %d %d %d", dim, lightoff, suspend); |
163 | 163 | ||
164 | v [ 0 ] = QMAX( 1000 * dim, 100 ); | 164 | v [ 0 ] = QMAX( 1000 * dim, 100 ); |
165 | v [ 1 ] = QMAX( 1000 * lightoff, 100 ); | 165 | v [ 1 ] = QMAX( 1000 * lightoff, 100 ); |
166 | v [ 2 ] = QMAX( 1000 * suspend, 100 ); | 166 | v [ 2 ] = QMAX( 1000 * suspend, 100 ); |
167 | v [ 3 ] = 0; | 167 | v [ 3 ] = 0; |
168 | 168 | ||
169 | if ( !dim && !lightoff && !suspend ) | 169 | if ( !dim && !lightoff && !suspend ) |
170 | QWSServer::setScreenSaverInterval( 0 ); | 170 | QWSServer::setScreenSaverInterval( 0 ); |
171 | else | 171 | else |
172 | QWSServer::setScreenSaverIntervals( v ); | 172 | QWSServer::setScreenSaverIntervals( v ); |
173 | } | 173 | } |
174 | 174 | ||
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 | */ |
182 | void OpieScreenSaver::setInterval ( int interval ) | 182 | void OpieScreenSaver::setInterval ( int interval ) |
183 | { | 183 | { |
184 | setIntervals ( -1, -1, interval ); | 184 | setIntervals ( -1, -1, interval ); |
185 | } | 185 | } |
186 | 186 | ||
187 | 187 | ||
188 | void OpieScreenSaver::setMode ( int mode ) | 188 | void 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 | */ |
205 | void OpieScreenSaver::setBacklight ( int bright ) | 205 | void 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 | */ |
250 | void OpieScreenSaver::setBacklightInternal ( int bright ) | 252 | void 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; |
262 | m_backlight_forcedoff = !bright; | 264 | m_backlight_forcedoff = !bright; |
263 | } | 265 | } |
264 | if ( bright == -1 ) | 266 | if ( bright == -1 ) |
265 | bright = m_use_light_sensor ? m_backlight_sensor : m_backlight_normal; | 267 | bright = m_use_light_sensor ? m_backlight_sensor : m_backlight_normal; |
266 | 268 | ||
267 | if ( bright != m_backlight_current ) { | 269 | if ( bright != m_backlight_current ) { |
268 | ODevice::inst ( )-> setDisplayBrightness ( bright ); | 270 | ODevice::inst ( )-> setDisplayBrightness ( bright ); |
269 | m_backlight_current = bright; | 271 | m_backlight_current = bright; |
270 | } | 272 | } |
271 | } | 273 | } |
272 | 274 | ||
273 | 275 | ||
274 | /** | 276 | /** |
275 | * Timer event used for automatic setting the backlight according to a light sensor | 277 | * Timer event used for automatic setting the backlight according to a light sensor |
276 | * and to set the default brightness | 278 | * and to set the default brightness |
277 | */ | 279 | */ |
278 | void OpieScreenSaver::timerEvent ( QTimerEvent * ) | 280 | void OpieScreenSaver::timerEvent ( QTimerEvent * ) |
279 | { | 281 | { |
280 | int s = ODevice::inst ( )-> readLightSensor ( ) * 256 / ODevice::inst ( )-> lightSensorResolution ( ); | 282 | int s = ODevice::inst ( )-> readLightSensor ( ) * 256 / ODevice::inst ( )-> lightSensorResolution ( ); |
281 | 283 | ||
282 | if ( s < m_sensordata [LS_SensorMin] ) | 284 | if ( s < m_sensordata [LS_SensorMin] ) |
283 | m_backlight_sensor = m_sensordata [LS_LightMax]; | 285 | m_backlight_sensor = m_sensordata [LS_LightMax]; |
284 | else if ( s >= m_sensordata [LS_SensorMax] ) | 286 | else if ( s >= m_sensordata [LS_SensorMax] ) |
285 | m_backlight_sensor = m_sensordata [LS_LightMin]; | 287 | m_backlight_sensor = m_sensordata [LS_LightMin]; |
286 | else { | 288 | else { |
287 | int dx = m_sensordata [LS_SensorMax] - m_sensordata [LS_SensorMin]; | 289 | int dx = m_sensordata [LS_SensorMax] - m_sensordata [LS_SensorMin]; |
288 | int dy = m_sensordata [LS_LightMax] - m_sensordata [LS_LightMin]; | 290 | int dy = m_sensordata [LS_LightMax] - m_sensordata [LS_LightMin]; |
289 | 291 | ||
290 | int stepno = ( s - m_sensordata [LS_SensorMin] ) * m_sensordata [LS_Steps] / dx; // dx is never 0 | 292 | int stepno = ( s - m_sensordata [LS_SensorMin] ) * m_sensordata [LS_Steps] / dx; // dx is never 0 |
291 | 293 | ||
292 | m_backlight_sensor = m_sensordata [LS_LightMax] - dy * stepno / ( m_sensordata [LS_Steps] - 1 ); | 294 | m_backlight_sensor = m_sensordata [LS_LightMax] - dy * stepno / ( m_sensordata [LS_Steps] - 1 ); |
293 | } | 295 | } |
294 | 296 | ||
295 | //qDebug ( "f(%d) = %d [%d - %d] -> [%d - %d] / %d", s, m_backlight_sensor, m_sensordata [LS_SensorMin], m_sensordata [LS_SensorMax], m_sensordata [LS_LightMin], m_sensordata [LS_LightMax], m_sensordata [LS_Steps] ); | 297 | //qDebug ( "f(%d) = %d [%d - %d] -> [%d - %d] / %d", s, m_backlight_sensor, m_sensordata [LS_SensorMin], m_sensordata [LS_SensorMax], m_sensordata [LS_LightMin], m_sensordata [LS_LightMax], m_sensordata [LS_Steps] ); |
296 | 298 | ||
297 | if ( m_level <= 0 ) | 299 | if ( m_level <= 0 ) |
298 | setBacklightInternal ( -1 ); | 300 | setBacklightInternal ( -1 ); |
299 | } | 301 | } |
300 | 302 | ||
301 | 303 | ||
302 | /** | 304 | /** |
303 | * Like ODevice::setDisplayStatus(), but keep current state in m_lcd_status. | 305 | * Like ODevice::setDisplayStatus(), but keep current state in m_lcd_status. |
304 | */ | 306 | */ |
305 | void OpieScreenSaver::setDisplayState ( bool on ) | 307 | void OpieScreenSaver::setDisplayState ( bool on ) |
306 | { | 308 | { |
307 | if ( m_lcd_status != on ) { | 309 | if ( m_lcd_status != on ) { |
308 | ODevice::inst ( ) -> setDisplayStatus ( on ); | 310 | ODevice::inst ( ) -> setDisplayStatus ( on ); |
309 | m_lcd_status = on; | 311 | m_lcd_status = on; |
310 | } | 312 | } |
311 | } | 313 | } |
312 | 314 | ||
313 | 315 | ||
314 | /** | 316 | /** |
315 | * Set display to default ac/battery settings when power status changed. | 317 | * Set display to default ac/battery settings when power status changed. |
316 | */ | 318 | */ |
317 | void OpieScreenSaver::powerStatusChanged ( PowerStatus ps ) | 319 | void OpieScreenSaver::powerStatusChanged ( PowerStatus ps ) |
318 | { | 320 | { |
319 | bool newonac = ( ps. acStatus ( ) == PowerStatus::Online ); | 321 | bool newonac = ( ps. acStatus ( ) == PowerStatus::Online ); |
320 | 322 | ||
321 | if ( newonac != m_on_ac ) { | 323 | if ( newonac != m_on_ac ) { |
322 | m_on_ac = newonac; | 324 | m_on_ac = newonac; |
323 | setInterval ( -1 ); | 325 | setInterval ( -1 ); |
324 | setBacklight ( -1 ); | 326 | setBacklight ( -1 ); |
325 | restore ( ); | 327 | restore ( ); |
326 | } | 328 | } |
327 | } | 329 | } |