author | sandman <sandman> | 2002-10-28 23:41:14 (UTC) |
---|---|---|
committer | sandman <sandman> | 2002-10-28 23:41:14 (UTC) |
commit | a775c3be38fc7fbd5d120e7e3c1dd3a80a250293 (patch) (unidiff) | |
tree | 6cca17bab081143f2d0321c317d26f91042f729f | |
parent | 7aaf3d45d9156a126a753311ffdb220a550d47a5 (diff) | |
download | opie-a775c3be38fc7fbd5d120e7e3c1dd3a80a250293.zip opie-a775c3be38fc7fbd5d120e7e3c1dd3a80a250293.tar.gz opie-a775c3be38fc7fbd5d120e7e3c1dd3a80a250293.tar.bz2 |
- OpieScreenSaver now uses the calibration data for the light sensor
-rw-r--r-- | core/launcher/screensaver.cpp | 37 | ||||
-rw-r--r-- | core/launcher/screensaver.h | 13 |
2 files changed, 48 insertions, 2 deletions
diff --git a/core/launcher/screensaver.cpp b/core/launcher/screensaver.cpp index 9e823ff..741591e 100644 --- a/core/launcher/screensaver.cpp +++ b/core/launcher/screensaver.cpp | |||
@@ -1,77 +1,79 @@ | |||
1 | 1 | ||
2 | #include "screensaver.h" | 2 | #include "screensaver.h" |
3 | 3 | ||
4 | #include <qpe/config.h> | 4 | #include <qpe/config.h> |
5 | #include <qpe/power.h> | 5 | #include <qpe/power.h> |
6 | #include <qpe/network.h> | 6 | #include <qpe/network.h> |
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 | OpieScreenSaver::OpieScreenSaver ( ) | 15 | OpieScreenSaver::OpieScreenSaver ( ) |
15 | : QObject ( 0, "screensaver" ), QWSScreenSaver ( ) | 16 | : QObject ( 0, "screensaver" ), QWSScreenSaver ( ) |
16 | { | 17 | { |
17 | m_disable_suspend = 100; | 18 | m_disable_suspend = 100; |
18 | m_enable_dim = false; | 19 | m_enable_dim = false; |
19 | m_enable_lightoff = false; | 20 | m_enable_lightoff = false; |
20 | m_enable_suspend = false; | 21 | m_enable_suspend = false; |
21 | m_onlylcdoff = false; | 22 | m_onlylcdoff = false; |
22 | 23 | ||
23 | m_enable_dim_ac = false; | 24 | m_enable_dim_ac = false; |
24 | m_enable_lightoff_ac = false; | 25 | m_enable_lightoff_ac = false; |
25 | m_enable_suspend_ac = false; | 26 | m_enable_suspend_ac = false; |
26 | m_onlylcdoff_ac = false; | 27 | m_onlylcdoff_ac = false; |
27 | 28 | ||
28 | m_use_light_sensor = false; | 29 | m_use_light_sensor = false; |
29 | m_backlight_sensor = -1; | 30 | m_backlight_sensor = -1; |
31 | ::memset ( m_sensordata, 0xff, LS_Count * sizeof( m_sensordata [0] )); | ||
30 | 32 | ||
31 | m_lcd_status = true; | 33 | m_lcd_status = true; |
32 | 34 | ||
33 | m_backlight_normal = -1; | 35 | m_backlight_normal = -1; |
34 | m_backlight_current = -1; | 36 | m_backlight_current = -1; |
35 | m_backlight_forcedoff = false; | 37 | m_backlight_forcedoff = false; |
36 | 38 | ||
37 | m_on_ac = false; | 39 | m_on_ac = false; |
38 | 40 | ||
39 | m_level = -1; | 41 | m_level = -1; |
40 | 42 | ||
41 | // 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) |
42 | ODevice::inst ( )-> setDisplayStatus ( true ); | 44 | ODevice::inst ( )-> setDisplayStatus ( true ); |
43 | setBacklight ( -1 ); | 45 | setBacklight ( -1 ); |
44 | } | 46 | } |
45 | 47 | ||
46 | 48 | ||
47 | void OpieScreenSaver::restore() | 49 | void OpieScreenSaver::restore() |
48 | { | 50 | { |
49 | m_level = -1; | 51 | m_level = -1; |
50 | 52 | ||
51 | if ( !m_lcd_status ) { // We must have turned it off | 53 | if ( !m_lcd_status ) { // We must have turned it off |
52 | ODevice::inst ( ) -> setDisplayStatus ( true ); | 54 | ODevice::inst ( ) -> setDisplayStatus ( true ); |
53 | m_lcd_status = true; | 55 | m_lcd_status = true; |
54 | } | 56 | } |
55 | 57 | ||
56 | setBacklightInternal ( -1 ); | 58 | setBacklightInternal ( -1 ); |
57 | } | 59 | } |
58 | 60 | ||
59 | 61 | ||
60 | bool OpieScreenSaver::save( int level ) | 62 | bool OpieScreenSaver::save( int level ) |
61 | { | 63 | { |
62 | m_level = level; | 64 | m_level = level; |
63 | 65 | ||
64 | switch ( level ) { | 66 | switch ( level ) { |
65 | case 0: | 67 | case 0: |
66 | if (( m_on_ac && m_enable_dim_ac ) || | 68 | if (( m_on_ac && m_enable_dim_ac ) || |
67 | ( !m_on_ac && m_enable_dim )) { | 69 | ( !m_on_ac && m_enable_dim )) { |
68 | if (( m_disable_suspend > 0 ) && ( m_backlight_current > 1 ) && !m_use_light_sensor ) | 70 | if (( m_disable_suspend > 0 ) && ( m_backlight_current > 1 ) && !m_use_light_sensor ) |
69 | setBacklightInternal ( 1 ); // lowest non-off | 71 | setBacklightInternal ( 1 ); // lowest non-off |
70 | } | 72 | } |
71 | return true; | 73 | return true; |
72 | break; | 74 | break; |
73 | 75 | ||
74 | case 1: | 76 | case 1: |
75 | if (( m_on_ac && m_enable_lightoff_ac ) || | 77 | if (( m_on_ac && m_enable_lightoff_ac ) || |
76 | ( !m_on_ac && m_enable_lightoff )) { | 78 | ( !m_on_ac && m_enable_lightoff )) { |
77 | if ( m_disable_suspend > 1 ) | 79 | if ( m_disable_suspend > 1 ) |
@@ -128,110 +130,141 @@ void OpieScreenSaver::setIntervals ( int i1, int i2, int i3 ) | |||
128 | else { | 130 | else { |
129 | m_enable_dim = ( i1 > 0 ); | 131 | m_enable_dim = ( i1 > 0 ); |
130 | m_enable_lightoff = ( i2 > 0 ); | 132 | m_enable_lightoff = ( i2 > 0 ); |
131 | m_enable_suspend = ( i3 > 0 ); | 133 | m_enable_suspend = ( i3 > 0 ); |
132 | m_onlylcdoff = config.readNumEntry ( "LcdOffOnly", 0 ); | 134 | m_onlylcdoff = config.readNumEntry ( "LcdOffOnly", 0 ); |
133 | } | 135 | } |
134 | 136 | ||
135 | qDebug("screen saver intervals: %d %d %d", i1, i2, i3); | 137 | qDebug("screen saver intervals: %d %d %d", i1, i2, i3); |
136 | 138 | ||
137 | v [ 0 ] = QMAX( 1000 * i1, 100 ); | 139 | v [ 0 ] = QMAX( 1000 * i1, 100 ); |
138 | v [ 1 ] = QMAX( 1000 * i2, 100 ); | 140 | v [ 1 ] = QMAX( 1000 * i2, 100 ); |
139 | v [ 2 ] = QMAX( 1000 * i3, 100 ); | 141 | v [ 2 ] = QMAX( 1000 * i3, 100 ); |
140 | v [ 3 ] = 0; | 142 | v [ 3 ] = 0; |
141 | 143 | ||
142 | if ( !i1 && !i2 && !i3 ) | 144 | if ( !i1 && !i2 && !i3 ) |
143 | QWSServer::setScreenSaverInterval( 0 ); | 145 | QWSServer::setScreenSaverInterval( 0 ); |
144 | else | 146 | else |
145 | QWSServer::setScreenSaverIntervals( v ); | 147 | QWSServer::setScreenSaverIntervals( v ); |
146 | } | 148 | } |
147 | 149 | ||
148 | 150 | ||
149 | void OpieScreenSaver::setInterval ( int interval ) | 151 | void OpieScreenSaver::setInterval ( int interval ) |
150 | { | 152 | { |
151 | setIntervals ( -1, -1, interval ); | 153 | setIntervals ( -1, -1, interval ); |
152 | } | 154 | } |
153 | 155 | ||
154 | 156 | ||
155 | void OpieScreenSaver::setMode ( int mode ) | 157 | void OpieScreenSaver::setMode ( int mode ) |
156 | { | 158 | { |
157 | if ( mode > m_disable_suspend ) | 159 | if ( mode > m_disable_suspend ) |
158 | setInterval ( -1 ); | 160 | setInterval ( -1 ); |
159 | m_disable_suspend = mode; | 161 | m_disable_suspend = mode; |
160 | } | 162 | } |
161 | 163 | ||
162 | 164 | ||
163 | void OpieScreenSaver::setBacklight ( int bright ) | 165 | void OpieScreenSaver::setBacklight ( int bright ) |
164 | { | 166 | { |
165 | // Read from config | 167 | // Read from config |
166 | Config config ( "apm" ); | 168 | Config config ( "apm" ); |
167 | config. setGroup ( m_on_ac ? "AC" : "Battery" ); | 169 | config. setGroup ( m_on_ac ? "AC" : "Battery" ); |
168 | m_backlight_normal = config. readNumEntry ( "Brightness", 255 ); | 170 | m_backlight_normal = config. readNumEntry ( "Brightness", 255 ); |
169 | 171 | ||
170 | m_use_light_sensor = config. readBoolEntry ( "LightSensor", false ); | 172 | m_use_light_sensor = config. readBoolEntry ( "LightSensor", false ); |
171 | 173 | ||
172 | qDebug ( "setBacklight: %d (ls: %d)", m_backlight_normal, m_use_light_sensor ? 1 : 0 ); | 174 | qDebug ( "setBacklight: %d (ls: %d)", m_backlight_normal, m_use_light_sensor ? 1 : 0 ); |
173 | 175 | ||
174 | killTimers ( ); | 176 | killTimers ( ); |
175 | if ( m_use_light_sensor ) { | 177 | if ( m_use_light_sensor ) { |
178 | QStringList sl = config. readListEntry ( "LightSensorData", ';' ); | ||
179 | |||
180 | m_sensordata [LS_SensorMin] = 40; | ||
181 | m_sensordata [LS_SensorMax] = 215; | ||
182 | m_sensordata [LS_LightMin] = 1; | ||
183 | m_sensordata [LS_LightMax] = 255; | ||
184 | m_sensordata [LS_Steps] = 12; | ||
185 | m_sensordata [LS_Interval] = 2000; | ||
186 | |||
187 | for ( uint i = 0; i < LS_Count; i++ ) { | ||
188 | if ( i < sl. count ( )) | ||
189 | m_sensordata [i] = sl [i]. toInt ( ); | ||
190 | } | ||
191 | |||
176 | timerEvent ( 0 ); | 192 | timerEvent ( 0 ); |
177 | startTimer ( 2000 ); | 193 | startTimer ( m_sensordata [LS_Interval] ); |
178 | } | 194 | } |
179 | 195 | ||
180 | setBacklightInternal ( bright ); | 196 | setBacklightInternal ( bright ); |
181 | } | 197 | } |
182 | 198 | ||
183 | 199 | ||
184 | void OpieScreenSaver::setBacklightInternal ( int bright ) | 200 | void OpieScreenSaver::setBacklightInternal ( int bright ) |
185 | { | 201 | { |
186 | if ( bright == -3 ) { | 202 | if ( bright == -3 ) { |
187 | // Forced on | 203 | // Forced on |
188 | m_backlight_forcedoff = false; | 204 | m_backlight_forcedoff = false; |
189 | bright = -1; | 205 | bright = -1; |
190 | } | 206 | } |
191 | if ( m_backlight_forcedoff && bright != -2 ) | 207 | if ( m_backlight_forcedoff && bright != -2 ) |
192 | return ; | 208 | return ; |
193 | if ( bright == -2 ) { | 209 | if ( bright == -2 ) { |
194 | // Toggle between off and on | 210 | // Toggle between off and on |
195 | bright = m_backlight_current ? 0 : -1; | 211 | bright = m_backlight_current ? 0 : -1; |
196 | m_backlight_forcedoff = !bright; | 212 | m_backlight_forcedoff = !bright; |
197 | } | 213 | } |
198 | if ( bright == -1 ) | 214 | if ( bright == -1 ) |
199 | bright = m_use_light_sensor ? m_backlight_sensor : m_backlight_normal; | 215 | bright = m_use_light_sensor ? m_backlight_sensor : m_backlight_normal; |
200 | 216 | ||
201 | if ( bright != m_backlight_current ) { | 217 | if ( bright != m_backlight_current ) { |
202 | ODevice::inst ( )-> setDisplayBrightness ( bright ); | 218 | ODevice::inst ( )-> setDisplayBrightness ( bright ); |
203 | m_backlight_current = bright; | 219 | m_backlight_current = bright; |
204 | } | 220 | } |
205 | } | 221 | } |
206 | 222 | ||
207 | 223 | ||
208 | void OpieScreenSaver::timerEvent ( QTimerEvent * ) | 224 | void OpieScreenSaver::timerEvent ( QTimerEvent * ) |
209 | { | 225 | { |
210 | m_backlight_sensor = (( 255 - ODevice::inst ( )-> readLightSensor ( )) * m_backlight_normal ) / 255; | 226 | int s = ODevice::inst ( )-> readLightSensor ( ); |
227 | |||
228 | if ( s < m_sensordata [LS_SensorMin] ) | ||
229 | m_backlight_sensor = m_sensordata [LS_LightMax]; | ||
230 | else if ( s >= m_sensordata [LS_SensorMax] ) | ||
231 | m_backlight_sensor = m_sensordata [LS_LightMin]; | ||
232 | else { | ||
233 | int dx = m_sensordata [LS_SensorMax] - m_sensordata [LS_SensorMin]; | ||
234 | int dy = m_sensordata [LS_LightMax] - m_sensordata [LS_LightMin]; | ||
235 | |||
236 | int stepno = ( s - m_sensordata [LS_SensorMin] ) * m_sensordata [LS_Steps] / dx; | ||
237 | |||
238 | m_backlight_sensor = m_sensordata [LS_LightMax] - dy * stepno / ( m_sensordata [LS_Steps] - 1 ); | ||
239 | } | ||
240 | if ( !m_backlight_sensor ) | ||
241 | m_backlight_sensor = 1; | ||
242 | |||
243 | // 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] ); | ||
211 | 244 | ||
212 | if ( m_level <= 0 ) | 245 | if ( m_level <= 0 ) |
213 | setBacklightInternal ( -1 ); | 246 | setBacklightInternal ( -1 ); |
214 | } | 247 | } |
215 | 248 | ||
216 | 249 | ||
217 | void OpieScreenSaver::setDisplayState ( bool on ) | 250 | void OpieScreenSaver::setDisplayState ( bool on ) |
218 | { | 251 | { |
219 | if ( m_lcd_status != on ) { | 252 | if ( m_lcd_status != on ) { |
220 | ODevice::inst ( ) -> setDisplayStatus ( on ); | 253 | ODevice::inst ( ) -> setDisplayStatus ( on ); |
221 | m_lcd_status = on; | 254 | m_lcd_status = on; |
222 | } | 255 | } |
223 | } | 256 | } |
224 | 257 | ||
225 | 258 | ||
226 | void OpieScreenSaver::powerStatusChanged ( PowerStatus ps ) | 259 | void OpieScreenSaver::powerStatusChanged ( PowerStatus ps ) |
227 | { | 260 | { |
228 | bool newonac = ( ps. acStatus ( ) == PowerStatus::Online ); | 261 | bool newonac = ( ps. acStatus ( ) == PowerStatus::Online ); |
229 | 262 | ||
230 | if ( newonac != m_on_ac ) { | 263 | if ( newonac != m_on_ac ) { |
231 | m_on_ac = newonac; | 264 | m_on_ac = newonac; |
232 | setInterval ( -1 ); | 265 | setInterval ( -1 ); |
233 | setBacklight ( -1 ); | 266 | setBacklight ( -1 ); |
234 | restore ( ); | 267 | restore ( ); |
235 | } | 268 | } |
236 | } | 269 | } |
237 | 270 | ||
diff --git a/core/launcher/screensaver.h b/core/launcher/screensaver.h index 9126f33..da10a8d 100644 --- a/core/launcher/screensaver.h +++ b/core/launcher/screensaver.h | |||
@@ -2,60 +2,73 @@ | |||
2 | #define __LAUNCHER_SCREENSAVER_H__ | 2 | #define __LAUNCHER_SCREENSAVER_H__ |
3 | 3 | ||
4 | #include <qwindowsystem_qws.h> | 4 | #include <qwindowsystem_qws.h> |
5 | #include <qobject.h> | 5 | #include <qobject.h> |
6 | 6 | ||
7 | #include <qpe/power.h> | 7 | #include <qpe/power.h> |
8 | 8 | ||
9 | class OpieScreenSaver : public QObject, public QWSScreenSaver | 9 | class OpieScreenSaver : public QObject, public QWSScreenSaver |
10 | { | 10 | { |
11 | public: | 11 | public: |
12 | OpieScreenSaver ( ); | 12 | OpieScreenSaver ( ); |
13 | 13 | ||
14 | void restore ( ); | 14 | void restore ( ); |
15 | bool save ( int level ); | 15 | bool save ( int level ); |
16 | 16 | ||
17 | void setIntervals( int i1, int i2, int i3 ); | 17 | void setIntervals( int i1, int i2, int i3 ); |
18 | void setIntervalsAC( int i1, int i2, int i3 ); | 18 | void setIntervalsAC( int i1, int i2, int i3 ); |
19 | 19 | ||
20 | void setInterval ( int interval ); | 20 | void setInterval ( int interval ); |
21 | 21 | ||
22 | void setMode ( int mode ); | 22 | void setMode ( int mode ); |
23 | 23 | ||
24 | void setBacklight ( int bright ); | 24 | void setBacklight ( int bright ); |
25 | void setDisplayState ( bool on ); | 25 | void setDisplayState ( bool on ); |
26 | 26 | ||
27 | void powerStatusChanged ( PowerStatus ps ); | 27 | void powerStatusChanged ( PowerStatus ps ); |
28 | 28 | ||
29 | private: | 29 | private: |
30 | void setBacklightInternal ( int bright ); | 30 | void setBacklightInternal ( int bright ); |
31 | 31 | ||
32 | protected: | 32 | protected: |
33 | virtual void timerEvent ( QTimerEvent * ); | 33 | virtual void timerEvent ( QTimerEvent * ); |
34 | 34 | ||
35 | private: | 35 | private: |
36 | int m_disable_suspend; | 36 | int m_disable_suspend; |
37 | bool m_enable_dim; | 37 | bool m_enable_dim; |
38 | bool m_enable_lightoff; | 38 | bool m_enable_lightoff; |
39 | bool m_enable_suspend; | 39 | bool m_enable_suspend; |
40 | bool m_onlylcdoff; | 40 | bool m_onlylcdoff; |
41 | 41 | ||
42 | bool m_enable_dim_ac; | 42 | bool m_enable_dim_ac; |
43 | bool m_enable_lightoff_ac; | 43 | bool m_enable_lightoff_ac; |
44 | bool m_enable_suspend_ac; | 44 | bool m_enable_suspend_ac; |
45 | bool m_onlylcdoff_ac; | 45 | bool m_onlylcdoff_ac; |
46 | 46 | ||
47 | bool m_use_light_sensor; | 47 | bool m_use_light_sensor; |
48 | int m_backlight_sensor; | 48 | int m_backlight_sensor; |
49 | 49 | ||
50 | enum { | ||
51 | LS_Interval = 0, | ||
52 | LS_Steps, | ||
53 | LS_SensorMin, | ||
54 | LS_SensorMax, | ||
55 | LS_LightMin, | ||
56 | LS_LightMax, | ||
57 | |||
58 | LS_Count | ||
59 | }; | ||
60 | |||
61 | int m_sensordata [LS_Count]; | ||
62 | |||
50 | bool m_lcd_status; | 63 | bool m_lcd_status; |
51 | 64 | ||
52 | int m_backlight_normal; | 65 | int m_backlight_normal; |
53 | int m_backlight_current; | 66 | int m_backlight_current; |
54 | bool m_backlight_forcedoff; | 67 | bool m_backlight_forcedoff; |
55 | 68 | ||
56 | bool m_on_ac; | 69 | bool m_on_ac; |
57 | 70 | ||
58 | int m_level; | 71 | int m_level; |
59 | }; | 72 | }; |
60 | 73 | ||
61 | #endif | 74 | #endif |