author | alwin <alwin> | 2005-03-14 09:14:08 (UTC) |
---|---|---|
committer | alwin <alwin> | 2005-03-14 09:14:08 (UTC) |
commit | 69f310d4a0a2330d10ba37ff4db388e8c60ba64b (patch) (unidiff) | |
tree | 95d8e7660560ae88d04d6215b5b3e048400f7ebf | |
parent | 826bc5ef2aa34877fd8816ddfc4156f865dc9149 (diff) | |
download | opie-69f310d4a0a2330d10ba37ff4db388e8c60ba64b.zip opie-69f310d4a0a2330d10ba37ff4db388e8c60ba64b.tar.gz opie-69f310d4a0a2330d10ba37ff4db388e8c60ba64b.tar.bz2 |
hopefull speedups on keyeventhandler, eventhandler will just set when
device with hinge-sensor.
-rw-r--r-- | libopie2/opiecore/device/odevice_zaurus.cpp | 13 |
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 | |||
@@ -239,7 +239,4 @@ void Zaurus::initButtons() | |||
239 | return; | 239 | return; |
240 | 240 | ||
241 | if ( isQWS( ) ) { | ||
242 | addPreHandler(this); | ||
243 | } | ||
244 | 241 | ||
245 | d->m_buttons = new QValueList <ODeviceButton>; | 242 | d->m_buttons = new QValueList <ODeviceButton>; |
@@ -250,4 +247,7 @@ void Zaurus::initButtons() | |||
250 | case Model_Zaurus_SLC3000: // fallthrough | 247 | case Model_Zaurus_SLC3000: // fallthrough |
251 | case Model_Zaurus_SLC7x0: | 248 | case Model_Zaurus_SLC7x0: |
249 | if ( isQWS( ) ) { | ||
250 | addPreHandler(this); // hinge-sensor-handler | ||
251 | } | ||
252 | pz_buttons = z_buttons_c700; | 252 | pz_buttons = z_buttons_c700; |
253 | buttoncount = ARRAY_SIZE(z_buttons_c700); | 253 | buttoncount = ARRAY_SIZE(z_buttons_c700); |
@@ -604,11 +604,7 @@ OHingeStatus Zaurus::readHingeSensor() const | |||
604 | bool Zaurus::filter ( int /*unicode*/, int keycode, int modifiers, bool isPress, bool autoRepeat ) | 604 | bool Zaurus::filter ( int /*unicode*/, int keycode, int modifiers, bool isPress, bool autoRepeat ) |
605 | { | 605 | { |
606 | Transformation rot; | ||
607 | int newkeycode = keycode; | 606 | int newkeycode = keycode; |
608 | 607 | ||
609 | |||
610 | if (d->m_model!=Model_Zaurus_SLC3000 && d->m_model!=Model_Zaurus_SLC7x0) return false; | 608 | if (d->m_model!=Model_Zaurus_SLC3000 && d->m_model!=Model_Zaurus_SLC7x0) return false; |
611 | rot = rotation(); | ||
612 | if (rot==Rot0) return false; | ||
613 | 609 | ||
614 | /* map cursor keys depending on the hinge status */ | 610 | /* map cursor keys depending on the hinge status */ |
@@ -620,5 +616,5 @@ bool Zaurus::filter ( int /*unicode*/, int keycode, int modifiers, bool isPress, | |||
620 | case Key_Down : | 616 | case Key_Down : |
621 | { | 617 | { |
622 | if (rot==Rot90) { | 618 | if (rotation()==Rot90) { |
623 | newkeycode = Key_Left + ( keycode - Key_Left + 3 ) % 4; | 619 | newkeycode = Key_Left + ( keycode - Key_Left + 3 ) % 4; |
624 | } | 620 | } |
@@ -635,2 +631,3 @@ bool Zaurus::filter ( int /*unicode*/, int keycode, int modifiers, bool isPress, | |||
635 | return false; | 631 | return false; |
636 | } | 632 | } |
633 | |||