-rw-r--r-- | core/launcher/screensaver.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/launcher/screensaver.cpp b/core/launcher/screensaver.cpp index f818d62..094f388 100644 --- a/core/launcher/screensaver.cpp +++ b/core/launcher/screensaver.cpp | |||
@@ -83,193 +83,193 @@ bool OpieScreenSaver::save( int level ) | |||
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 | //odebug << "screen saver intervals: " << dim << " " << lightoff << " " << suspend << "" << oendl; | 162 | //odebug << "screen saver intervals: " << dim << " " << lightoff << " " << suspend << "" << oendl; |
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 interval 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, contrast 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 | int contrast = config. readNumEntry ( "Contrast", 127); |
212 | m_use_light_sensor = config. readBoolEntry ( "LightSensor", false ); | 212 | m_use_light_sensor = config. readBoolEntry ( "LightSensor", false ); |
213 | 213 | ||
214 | //odebug << "setBacklight: " << bright << " (norm: " << m_backlight_normal << ") (ls: " | 214 | //odebug << "setBacklight: " << bright << " (norm: " << m_backlight_normal << ") (ls: " |
215 | // << ( m_use_light_sensor ? 1 : 0 ) << ")" << oendl; | 215 | // << ( m_use_light_sensor ? 1 : 0 ) << ")" << oendl; |
216 | 216 | ||
217 | killTimers ( ); | 217 | killTimers ( ); |
218 | if (( bright < 0 ) && m_use_light_sensor ) { | 218 | if (( bright < 0 ) && m_use_light_sensor ) { |
219 | QStringList sl = config. readListEntry ( "LightSensorData", ';' ); | 219 | QStringList sl = config. readListEntry ( "LightSensorData", ';' ); |
220 | 220 | ||
221 | m_sensordata [LS_SensorMin] = 40; | 221 | m_sensordata [LS_SensorMin] = 40; |
222 | m_sensordata [LS_SensorMax] = 215; | 222 | m_sensordata [LS_SensorMax] = 215; |
223 | m_sensordata [LS_LightMin] = 1; | 223 | m_sensordata [LS_LightMin] = 1; |
224 | m_sensordata [LS_LightMax] = 255; | 224 | m_sensordata [LS_LightMax] = 255; |
225 | m_sensordata [LS_Steps] = 12; | 225 | m_sensordata [LS_Steps] = 12; |
226 | m_sensordata [LS_Interval] = 2000; | 226 | m_sensordata [LS_Interval] = 2000; |
227 | 227 | ||
228 | for ( uint i = 0; i < LS_Count; i++ ) { | 228 | for ( uint i = 0; i < LS_Count; i++ ) { |
229 | if ( i < sl. count ( )) | 229 | if ( i < sl. count ( )) |
230 | m_sensordata [i] = sl [i]. toInt ( ); | 230 | m_sensordata [i] = sl [i]. toInt ( ); |
231 | } | 231 | } |
232 | if ( m_sensordata [LS_Steps] < 2 ) // sanity check to avoid SIGFPE | 232 | if ( m_sensordata [LS_Steps] < 2 ) // sanity check to avoid SIGFPE |
233 | m_sensordata [LS_Steps] = 2; | 233 | m_sensordata [LS_Steps] = 2; |
234 | 234 | ||
235 | timerEvent ( 0 ); | 235 | timerEvent ( 0 ); |
236 | startTimer ( m_sensordata [LS_Interval] ); | 236 | startTimer ( m_sensordata [LS_Interval] ); |
237 | } | 237 | } |
238 | 238 | ||
239 | setBacklightInternal ( bright ); | 239 | setBacklightInternal ( bright ); |
240 | ODevice::inst ( )-> setDisplayContrast(contrast); | 240 | ODevice::inst ( )-> setDisplayContrast(contrast); |
241 | } | 241 | } |
242 | 242 | ||
243 | 243 | ||
244 | /** | 244 | /** |
245 | * Internal brightness setting method | 245 | * Internal brightness setting method |
246 | * | 246 | * |
247 | * Get's default values for backlight and light sensor from config file. | 247 | * Get's default values for backlight and light sensor from config file. |
248 | * | 248 | * |
249 | * @param bright desired brighness (-1 to use automatic sensor data or value | 249 | * @param bright desired brighness (-1 to use automatic sensor data or value |
250 | * from config file, -2 to toggle backlight on and off, -3 to | 250 | * from config file, -2 to toggle backlight on and off, -3 to |
251 | * force backlight off) | 251 | * force backlight off) |
252 | */ | 252 | */ |
253 | void OpieScreenSaver::setBacklightInternal ( int bright ) | 253 | void OpieScreenSaver::setBacklightInternal ( int bright ) |
254 | { | 254 | { |
255 | if ( bright == -3 ) { | 255 | if ( bright == -3 ) { |
256 | // Forced on | 256 | // Forced on |
257 | m_backlight_forcedoff = false; | 257 | m_backlight_forcedoff = false; |
258 | bright = -1; | 258 | bright = -1; |
259 | } | 259 | } |
260 | if ( m_backlight_forcedoff && bright != -2 ) | 260 | if ( m_backlight_forcedoff && bright != -2 ) |
261 | return ; | 261 | return ; |
262 | if ( bright == -2 ) { | 262 | if ( bright == -2 ) { |
263 | // Toggle between off and on | 263 | // Toggle between off and on |
264 | bright = m_backlight_current ? 0 : -1; | 264 | bright = m_backlight_current ? 0 : -1; |
265 | m_backlight_forcedoff = !bright; | 265 | m_backlight_forcedoff = !bright; |
266 | } | 266 | } |
267 | if ( bright == -1 ) | 267 | if ( bright == -1 ) |
268 | bright = m_use_light_sensor ? m_backlight_sensor : m_backlight_normal; | 268 | bright = m_use_light_sensor ? m_backlight_sensor : m_backlight_normal; |
269 | 269 | ||
270 | if ( bright != m_backlight_current ) { | 270 | if ( bright != m_backlight_current ) { |
271 | ODevice::inst ( )-> setDisplayBrightness ( bright ); | 271 | ODevice::inst ( )-> setDisplayBrightness ( bright ); |
272 | m_backlight_current = bright; | 272 | m_backlight_current = bright; |
273 | } | 273 | } |
274 | } | 274 | } |
275 | 275 | ||