author | aquadran <aquadran> | 2007-03-17 22:08:43 (UTC) |
---|---|---|
committer | aquadran <aquadran> | 2007-03-17 22:08:43 (UTC) |
commit | fb862bdc6c9a6f5b6e7529823eb4b56cc7085a59 (patch) (side-by-side diff) | |
tree | 11ab2be67d1ffc1fabdb0cb489bc14205117d8cd /libopie2/opiecore/device/odevice_mypal.cpp | |
parent | 794f3bb9cf973e59a8ca773f42d72a6476b7a4e1 (diff) | |
download | opie-fb862bdc6c9a6f5b6e7529823eb4b56cc7085a59.zip opie-fb862bdc6c9a6f5b6e7529823eb4b56cc7085a59.tar.gz opie-fb862bdc6c9a6f5b6e7529823eb4b56cc7085a59.tar.bz2 |
match h1910 and asus 716 to other pda latest changes
Diffstat (limited to 'libopie2/opiecore/device/odevice_mypal.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | libopie2/opiecore/device/odevice_mypal.cpp | 65 |
1 files changed, 31 insertions, 34 deletions
diff --git a/libopie2/opiecore/device/odevice_mypal.cpp b/libopie2/opiecore/device/odevice_mypal.cpp index 73b31cb..28e92bf 100644 --- a/libopie2/opiecore/device/odevice_mypal.cpp +++ b/libopie2/opiecore/device/odevice_mypal.cpp @@ -135,28 +135,32 @@ void MyPal::initButtons() reloadButtonMapping(); } bool MyPal::filter ( int /*unicode*/, int keycode, int modifiers, bool isPress, bool autoRepeat ) { int newkeycode = keycode; switch ( keycode ) { - case Key_Left : - case Key_Right: - case Key_Up : - case Key_Down : { - // Rotate the cursor keys by 270 - // keycode - Key_Left = position of the button starting from left clockwise - // add the rotation to it and modolo. No we've the original offset - // add the offset to the Key_Left key - if ( d->m_model == Model_MyPal_716 ) - newkeycode = Key_Left + ( keycode - Key_Left + 3 ) % 4; - break; - } + // QT has strange screen coordinate system, so depending + // on native device screen orientation, we need to rotate cursor keys + case Key_Left : + case Key_Right: + case Key_Up : + case Key_Down : { + int quarters; + switch (d->m_rotation) { + case Rot0: quarters = 3/*270deg*/; break; + case Rot90: quarters = 2/*270deg*/; break; + case Rot180: quarters = 1/*270deg*/; break; + case Rot270: quarters = 0/*270deg*/; break; + } + newkeycode = Key_Left + ( keycode - Key_Left + quarters ) % 4; + break; + } // map Power Button short/long press case HardKey_Suspend: { // Hope we don't have infinite recursion here: if ( isPress ) { if ( m_power_timer ) killTimer ( m_power_timer ); m_power_timer = startTimer ( 500 ); } @@ -205,64 +209,57 @@ bool MyPal::setDisplayBrightness ( int bright ) { bool res = false; if ( bright > 255 ) bright = 255; if ( bright < 0 ) bright = 0; - QDir sysClass( "/sys/class/backlight/pxafb/" ); + QDir sysClass( "/sys/class/backlight/" ); sysClass.setFilter(QDir::Dirs); - int fd; - if ( sysClass.exists() ) { - QString sysClassPath = sysClass.absFilePath( "/sys/class/backlight/pxafb/power" ); - fd = ::open( sysClassPath, O_WRONLY | O_NONBLOCK ); - if ( fd ) { - char buf[10]; - buf[0] = bright ? 0 : 4; - buf[1] = '\0'; - res = ( ::write( fd, &buf[0], 2 ) == 0 ); - ::close( fd ); - } - sysClassPath = sysClass.absFilePath( "/sys/class/backlight/pxafb/brightness" ); - fd = ::open( sysClassPath, O_WRONLY | O_NONBLOCK ); + if ( sysClass.exists() && sysClass.count() > 2 ) { + QString sysClassPath = sysClass.absFilePath( sysClass[2] + "/brightness" ); + int fd = ::open( sysClassPath, O_WRONLY|O_NONBLOCK ); if ( fd ) { - char buf[100]; - int len = ::snprintf( &buf[0], sizeof buf, "%d", bright ); - res = ( ::write( fd, &buf[0], len ) == 0 ); - ::close( fd ); + char buf[100]; + int val = bright * displayBrightnessResolution() / 255; + int len = ::snprintf( &buf[0], sizeof buf, "%d", val ); + res = ( ::write( fd, &buf[0], len ) == 0 ); + ::close( fd ); } } return res; } int MyPal::displayBrightnessResolution() const { switch ( model()) { case Model_MyPal_716: - return 7; + return 255; default: return OAbstractMobileDevice::displayBrightnessResolution(); } } bool MyPal::setDisplayStatus ( bool on ) { bool res = false; QDir sysClass( "/sys/class/lcd/" ); sysClass.setFilter(QDir::Dirs); - if ( sysClass.exists() ) { - QString sysClassPath = sysClass.absFilePath( "/sys/class/lcd/pxafb/power" ); - int fd = ::open( sysClassPath, O_WRONLY | O_NONBLOCK ); + if ( sysClass.exists() && sysClass.count() > 2 ) { + QString sysClassPath = sysClass.absFilePath( sysClass[2] + "/power" ); + int fd = ::open( sysClassPath, O_WRONLY|O_NONBLOCK ); if ( fd ) { char buf[10]; buf[0] = on ? 0 : 4; buf[1] = '\0'; res = ( ::write( fd, &buf[0], 2 ) == 0 ); ::close( fd ); } + } else { + res = OAbstractMobileDevice::setDisplayStatus(on); } return res; } |