hopefull speedups on keyeventhandler, eventhandler will just set when

device with hinge-sensor.

1 files changed, 5 insertions, 8 deletions

diff --git a/libopie2/opiecore/device/odevice_zaurus.cpp b/libopie2/opiecore/device/odevice_zaurus.cpp
index 89b9258..59d4eb0 100644
--- a/libopie2/opiecore/device/odevice_zaurus.cpp
+++ b/libopie2/opiecore/device/odevice_zaurus.cpp
@@ -209,75 +209,75 @@ void Zaurus::init(const QString& cpu_info)
 
     // set initial rotation
     switch( d->m_model ) {
         case Model_Zaurus_SL6000: // fallthrough
         case Model_Zaurus_SLA300:
             d->m_rotation = Rot0;
             break;
         case Model_Zaurus_SLC3000: // fallthrough
         case Model_Zaurus_SLC7x0:
             d->m_rotation = rotation();
             d->m_direction = direction();
             break;
         case Model_Zaurus_SLB600: // fallthrough
         case Model_Zaurus_SL5000: // fallthrough
         case Model_Zaurus_SL5500: // fallthrough
         default:
             d->m_rotation = Rot270;
             break;
     }
     m_leds[0] = Led_Off;
 
     if ( m_embedix )
         qDebug( "Zaurus::init() - Using the Embedix HAL on a %s", (const char*) d->m_modelstr );
     else
         qDebug( "Zaurus::init() - Using the OpenZaurus HAL on a %s", (const char*) d->m_modelstr );
 }
 
 void Zaurus::initButtons()
 {
     if ( d->m_buttons )
         return;
 
-    if ( isQWS( ) ) {
-        addPreHandler(this);
-    }
 
     d->m_buttons = new QValueList <ODeviceButton>;
 
     struct z_button * pz_buttons;
     int buttoncount;
     switch ( d->m_model ) {
         case Model_Zaurus_SLC3000: // fallthrough
         case Model_Zaurus_SLC7x0:
+            if ( isQWS( ) ) {
+                addPreHandler(this); // hinge-sensor-handler
+            }
             pz_buttons = z_buttons_c700;
             buttoncount = ARRAY_SIZE(z_buttons_c700);
             break;
         default:
             pz_buttons = z_buttons;
             buttoncount = ARRAY_SIZE(z_buttons);
             break;
     }
 
     for ( int i = 0; i < buttoncount; i++ ) {
         struct z_button *zb = pz_buttons + i;
         ODeviceButton b;
 
         b.setKeycode( zb->code );
         b.setUserText( QObject::tr( "Button", zb->utext ));
         b.setPixmap( Resource::loadPixmap( zb->pix ));
         b.setFactoryPresetPressedAction( OQCopMessage( makeChannel ( zb->fpressedservice ), zb->fpressedaction ));
         b.setFactoryPresetHeldAction( OQCopMessage( makeChannel ( zb->fheldservice ), zb->fheldaction ));
         d->m_buttons->append( b );
     }
 
     reloadButtonMapping();
 }
 
 
 
 typedef struct sharp_led_status {
     int which;   /* select which LED status is wanted. */
     int status;  /* set new led status if you call SHARP_LED_SETSTATUS */
 } sharp_led_status;
 
 void Zaurus::buzzer( int sound )
@@ -574,63 +574,60 @@ OHingeStatus Zaurus::readHingeSensor() const
             ::close (handle);
             if ( retval == CASE_CLOSED || retval == CASE_PORTRAIT || retval == CASE_LANDSCAPE )
             {
                 qDebug( "Zaurus::readHingeSensor() - result = %d", retval );
                 return static_cast<OHingeStatus>( retval );
             }
             else
             {
                 qWarning("Zaurus::readHingeSensor() - couldn't compute hinge status!" );
                 return CASE_UNKNOWN;
             }
         }
     }
     else
     {
         // corgi keyboard is event source 0 in OZ kernel 2.6
         OInputDevice* keyboard = OInputSystem::instance()->device( "event0" );
         if ( keyboard && keyboard->isHeld( OInputDevice::Key_KP0 ) ) return CASE_LANDSCAPE;
         else if ( keyboard && keyboard->isHeld( OInputDevice::Key_KP1 ) ) return CASE_PORTRAIT;
         else if ( keyboard && keyboard->isHeld( OInputDevice::Key_KP2 ) ) return CASE_CLOSED;
         qWarning("Zaurus::readHingeSensor() - couldn't compute hinge status!" );
         return CASE_UNKNOWN;
     }
 }
 
 /*
  * Take code from iPAQ device.
  * That way we switch the cursor directions depending on status of hinge sensor, eg. hardware direction.
  * I hope that is ok - Alwin
  */
 bool Zaurus::filter ( int /*unicode*/, int keycode, int modifiers, bool isPress, bool autoRepeat )
 {
-    Transformation rot;
     int newkeycode = keycode;
 
-
     if (d->m_model!=Model_Zaurus_SLC3000 && d->m_model!=Model_Zaurus_SLC7x0) return false;
-    rot = rotation();
-    if (rot==Rot0) return false;
 
     /* map cursor keys depending on the hinge status */
     switch ( keycode ) {
         // Rotate cursor keys
         case Key_Left :
         case Key_Right:
         case Key_Up   :
         case Key_Down :
         {
-            if (rot==Rot90) {
+            if (rotation()==Rot90) {
                 newkeycode = Key_Left + ( keycode - Key_Left + 3 ) % 4;
             }
         }
         break;
 
     }
     if (newkeycode!=keycode) {
         if ( newkeycode != Key_unknown ) {
             QWSServer::sendKeyEvent ( -1, newkeycode, modifiers, isPress, autoRepeat );
         }
         return true;
     }
     return false;
 }
+