| -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 @@ -2,40 +2,42 @@ #include "screensaver.h" #include <qpe/config.h> #include <qpe/power.h> #include <qpe/network.h> #include <opie/odevice.h> using namespace Opie; + OpieScreenSaver::OpieScreenSaver ( ) : QObject ( 0, "screensaver" ), QWSScreenSaver ( ) { m_disable_suspend = 100; m_enable_dim = false; m_enable_lightoff = false; m_enable_suspend = false; m_onlylcdoff = false; m_enable_dim_ac = false; m_enable_lightoff_ac = false; m_enable_suspend_ac = false; m_onlylcdoff_ac = false; m_use_light_sensor = false; m_backlight_sensor = -1; + ::memset ( m_sensordata, 0xff, LS_Count * sizeof( m_sensordata [0] )); m_lcd_status = true; m_backlight_normal = -1; m_backlight_current = -1; m_backlight_forcedoff = false; m_on_ac = false; m_level = -1; // Make sure the LCD is in fact on, (if opie was killed while the LCD is off it would still be off) @@ -164,26 +166,40 @@ void OpieScreenSaver::setBacklight ( int bright ) { // Read from config Config config ( "apm" ); config. setGroup ( m_on_ac ? "AC" : "Battery" ); m_backlight_normal = config. readNumEntry ( "Brightness", 255 ); m_use_light_sensor = config. readBoolEntry ( "LightSensor", false ); qDebug ( "setBacklight: %d (ls: %d)", m_backlight_normal, m_use_light_sensor ? 1 : 0 ); killTimers ( ); if ( m_use_light_sensor ) { + QStringList sl = config. readListEntry ( "LightSensorData", ';' ); + + m_sensordata [LS_SensorMin] = 40; + m_sensordata [LS_SensorMax] = 215; + m_sensordata [LS_LightMin] = 1; + m_sensordata [LS_LightMax] = 255; + m_sensordata [LS_Steps] = 12; + m_sensordata [LS_Interval] = 2000; + + for ( uint i = 0; i < LS_Count; i++ ) { + if ( i < sl. count ( )) + m_sensordata [i] = sl [i]. toInt ( ); + } + timerEvent ( 0 ); - startTimer ( 2000 ); + startTimer ( m_sensordata [LS_Interval] ); } setBacklightInternal ( bright ); } void OpieScreenSaver::setBacklightInternal ( int bright ) { if ( bright == -3 ) { // Forced on m_backlight_forcedoff = false; bright = -1; @@ -198,25 +214,42 @@ void OpieScreenSaver::setBacklightInternal ( int bright ) if ( bright == -1 ) bright = m_use_light_sensor ? m_backlight_sensor : m_backlight_normal; if ( bright != m_backlight_current ) { ODevice::inst ( )-> setDisplayBrightness ( bright ); m_backlight_current = bright; } } void OpieScreenSaver::timerEvent ( QTimerEvent * ) { - m_backlight_sensor = (( 255 - ODevice::inst ( )-> readLightSensor ( )) * m_backlight_normal ) / 255; + int s = ODevice::inst ( )-> readLightSensor ( ); + + if ( s < m_sensordata [LS_SensorMin] ) + m_backlight_sensor = m_sensordata [LS_LightMax]; + else if ( s >= m_sensordata [LS_SensorMax] ) + m_backlight_sensor = m_sensordata [LS_LightMin]; + else { + int dx = m_sensordata [LS_SensorMax] - m_sensordata [LS_SensorMin]; + int dy = m_sensordata [LS_LightMax] - m_sensordata [LS_LightMin]; + + int stepno = ( s - m_sensordata [LS_SensorMin] ) * m_sensordata [LS_Steps] / dx; + + m_backlight_sensor = m_sensordata [LS_LightMax] - dy * stepno / ( m_sensordata [LS_Steps] - 1 ); + } + if ( !m_backlight_sensor ) + m_backlight_sensor = 1; + + // 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] ); if ( m_level <= 0 ) setBacklightInternal ( -1 ); } void OpieScreenSaver::setDisplayState ( bool on ) { if ( m_lcd_status != on ) { ODevice::inst ( ) -> setDisplayStatus ( on ); m_lcd_status = on; } 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 @@ -38,24 +38,37 @@ private: bool m_enable_lightoff; bool m_enable_suspend; bool m_onlylcdoff; bool m_enable_dim_ac; bool m_enable_lightoff_ac; bool m_enable_suspend_ac; bool m_onlylcdoff_ac; bool m_use_light_sensor; int m_backlight_sensor; + enum { + LS_Interval = 0, + LS_Steps, + LS_SensorMin, + LS_SensorMax, + LS_LightMin, + LS_LightMax, + + LS_Count + }; + + int m_sensordata [LS_Count]; + bool m_lcd_status; int m_backlight_normal; int m_backlight_current; bool m_backlight_forcedoff; bool m_on_ac; int m_level; }; #endif |