1 files changed, 9 insertions, 13 deletions

diff --git a/libopie2/opiecore/device/odevice_ipaq.cpp b/libopie2/opiecore/device/odevice_ipaq.cpp
index 02b685a..6dc1295 100644
--- a/libopie2/opiecore/device/odevice_ipaq.cpp
+++ b/libopie2/opiecore/device/odevice_ipaq.cpp
@@ -256,146 +256,142 @@ QValueList <OLedState> iPAQ::ledStateList ( OLed l ) const
         vl << Led_Off << Led_On << Led_BlinkSlow << Led_BlinkFast;
     else if ( l == Led_BlueTooth && d->m_model == Model_iPAQ_H38xx )
         vl << Led_Off; // << Led_On << ???
 
     return vl;
 }
 
 OLedState iPAQ::ledState ( OLed l ) const
 {
     switch ( l ) {
         case Led_Power:
             return m_leds [0];
         case Led_BlueTooth:
             return m_leds [1];
         default:
             return Led_Off;
     }
 }
 
 bool iPAQ::setLedState ( OLed l, OLedState st )
 {
     static int fd = ::open ( "/dev/touchscreen/0", O_RDWR | O_NONBLOCK );
 
     if ( l == Led_Power ) {
         if ( fd >= 0 ) {
             LED_IN leds;
             ::memset ( &leds, 0, sizeof( leds ));
             leds. TotalTime  = 0;
             leds. OnTime     = 0;
             leds. OffTime    = 1;
             leds. OffOnBlink = 2;
 
             switch ( st ) {
                 case Led_Off      : leds. OffOnBlink = 0; break;
                 case Led_On       : leds. OffOnBlink = 1; break;
                 case Led_BlinkSlow: leds. OnTime = 10; leds. OffTime = 10; break;
                 case Led_BlinkFast: leds. OnTime =  5; leds. OffTime =  5; break;
             }
 
             if ( ::ioctl ( fd, LED_ON, &leds ) >= 0 ) {
                 m_leds [0] = st;
                 return true;
             }
         }
     }
     return false;
 }
 
 
 bool iPAQ::filter ( int /*unicode*/, int keycode, int modifiers, bool isPress, bool autoRepeat )
 {
     int newkeycode = keycode;
 
     switch ( keycode ) {
         // H38xx/H39xx have no "Q" key anymore - this is now the Mail key
         case HardKey_Menu: {
             if (( d->m_model == Model_iPAQ_H38xx ) ||
                 ( d->m_model == Model_iPAQ_H39xx ) ||
                 ( d->m_model == Model_iPAQ_H5xxx)) {
                 newkeycode = HardKey_Mail;
             }
             break;
         }
 
-        // Rotate cursor keys 180 or 270
+        // 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 : {
-            if (( d->m_model == Model_iPAQ_H31xx ) ||
-                ( d->m_model == Model_iPAQ_H38xx )) {
-                newkeycode = Key_Left + ( keycode - Key_Left + 2 ) % 4;
+            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;
             }
-            // 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_iPAQ_H5xxx ) ||
-		( d->m_model == Model_iPAQ_H191x ) ||
-		( d->m_model == Model_iPAQ_H4xxx ) ||
-		( d->m_model == Model_iPAQ_H1940 ))
-                newkeycode = Key_Left + ( keycode - Key_Left + 3 ) % 4;
+            newkeycode = Key_Left + ( keycode - Key_Left + quarters ) % 4;
             break;
         }
 
         // map Power Button short/long press to F34/F35
         case HardKey_Suspend: // Hope we don't have infinite recursion here
         case Key_SysReq: {
             if ( isPress ) {
                 if ( m_power_timer )
                     killTimer ( m_power_timer );
                 m_power_timer = startTimer ( 500 );
             }
             else if ( m_power_timer ) {
                 killTimer ( m_power_timer );
                 m_power_timer = 0;
                 QWSServer::sendKeyEvent ( -1, HardKey_Suspend, 0, true, false );
                 QWSServer::sendKeyEvent ( -1, HardKey_Suspend, 0, false, false );
             }
             newkeycode = Key_unknown;
             break;
         }
     }
 
     if ( newkeycode != keycode ) {
         if ( newkeycode != Key_unknown )
             QWSServer::sendKeyEvent ( -1, newkeycode, modifiers, isPress, autoRepeat );
         return true;
     }
     else
         return false;
 }
 
 void iPAQ::timerEvent ( QTimerEvent * )
 {
     killTimer ( m_power_timer );
     m_power_timer = 0;
     QWSServer::sendKeyEvent ( -1, HardKey_Backlight, 0, true, false );
     QWSServer::sendKeyEvent ( -1, HardKey_Backlight, 0, false, false );
 }
 
 
 void iPAQ::playAlarmSound()
 {
 #ifndef QT_NO_SOUND
     static Sound snd ( "alarm" );
     if(!snd.isFinished())
 	return;
 
     changeMixerForAlarm(0, "/dev/sound/mixer", &snd );
     snd. play();
 #endif
 }
 
 bool iPAQ::setDisplayBrightness ( int bright )
 {
     bool res = false;
     int fd;
 
     if ( bright > 255 )
         bright = 255;
     if ( bright < 0 )
         bright = 0;
 
     QDir sysClass( "/sys/class/backlight/" );
     sysClass.setFilter(QDir::Dirs);