| -rw-r--r-- | core/launcher/screensaver.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/core/launcher/screensaver.cpp b/core/launcher/screensaver.cpp index 088ed19..b9bb64c 100644 --- a/core/launcher/screensaver.cpp +++ b/core/launcher/screensaver.cpp @@ -131,13 +131,13 @@ void OpieScreenSaver::setIntervals ( int i1, int i2, int i3 ) m_enable_dim = ( i1 > 0 ); m_enable_lightoff = ( i2 > 0 ); m_enable_suspend = ( i3 > 0 ); m_onlylcdoff = config.readBoolEntry ( "LcdOffOnly", false ); } - qDebug("screen saver intervals: %d %d %d", i1, i2, i3); + //qDebug("screen saver intervals: %d %d %d", i1, i2, i3); v [ 0 ] = QMAX( 1000 * i1, 100 ); v [ 1 ] = QMAX( 1000 * i2, 100 ); v [ 2 ] = QMAX( 1000 * i3, 100 ); v [ 3 ] = 0; @@ -168,16 +168,16 @@ void OpieScreenSaver::setBacklight ( int bright ) Config config ( "apm" ); config. setGroup ( m_on_ac ? "AC" : "Battery" ); m_backlight_normal = config. readNumEntry ( "Brightness", m_on_ac ? 255 : 127 ); m_use_light_sensor = config. readBoolEntry ( "LightSensor", false ); -// qDebug ( "setBacklight: %d (ls: %d)", m_backlight_normal, m_use_light_sensor ? 1 : 0 ); + //qDebug ( "setBacklight: %d (norm: %d) (ls: %d)", bright, m_backlight_normal, m_use_light_sensor ? 1 : 0 ); killTimers ( ); - if ( m_use_light_sensor ) { + if (( bright < 0 ) && 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; @@ -222,13 +222,13 @@ void OpieScreenSaver::setBacklightInternal ( int bright ) } } void OpieScreenSaver::timerEvent ( QTimerEvent * ) { - int s = ODevice::inst ( )-> readLightSensor ( ); + int s = ODevice::inst ( )-> readLightSensor ( ) * 256 / ODevice::inst ( )-> lightSensorResolution ( ); 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 { @@ -236,14 +236,12 @@ void OpieScreenSaver::timerEvent ( QTimerEvent * ) int dy = m_sensordata [LS_LightMax] - m_sensordata [LS_LightMin]; int stepno = ( s - m_sensordata [LS_SensorMin] ) * m_sensordata [LS_Steps] / dx; // dx is never 0 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 ); } |