author | alwin <alwin> | 2005-03-15 11:24:43 (UTC) |
---|---|---|
committer | alwin <alwin> | 2005-03-15 11:24:43 (UTC) |
commit | 90d940ea8244140b25552bb8a28eacb7d3db01e8 (patch) (unidiff) | |
tree | 5de47f91c534f8c034f101ee6344af104d4cd31d /core/launcher | |
parent | 81989dcd316065c2e72ecf43fc2cb8bfbf82763f (diff) | |
download | opie-90d940ea8244140b25552bb8a28eacb7d3db01e8.zip opie-90d940ea8244140b25552bb8a28eacb7d3db01e8.tar.gz opie-90d940ea8244140b25552bb8a28eacb7d3db01e8.tar.bz2 |
setup a workaround for missing autorepeat flag on specialbuttons.
eg, keyfilter of serverapp stores the last pressed button itself and checks
against holdtime and releases itself. on c7x0/c8x0 it works with 2.6 kernel
cause keys are repeated without this flag - on 2.4 kernel I don't know
what happen (may that keys are not repeated)
-rw-r--r-- | core/launcher/serverapp.cpp | 22 | ||||
-rw-r--r-- | core/launcher/serverapp.h | 2 |
2 files changed, 18 insertions, 6 deletions
diff --git a/core/launcher/serverapp.cpp b/core/launcher/serverapp.cpp index 75d4ac1..6fe0479 100644 --- a/core/launcher/serverapp.cpp +++ b/core/launcher/serverapp.cpp | |||
@@ -145,5 +145,5 @@ void DesktopPowerAlerter::hideEvent( QHideEvent *e ) | |||
145 | //--------------------------------------------------------------------------- | 145 | //--------------------------------------------------------------------------- |
146 | 146 | ||
147 | KeyFilter::KeyFilter(QObject* parent) : QObject(parent), held_tid(0), heldButton(0) | 147 | KeyFilter::KeyFilter(QObject* parent) : QObject(parent), held_tid(0), heldButton(0),firedHeldButton(0) |
148 | { | 148 | { |
149 | /* We don't do this cause it would interfere with ODevice */ | 149 | /* We don't do this cause it would interfere with ODevice */ |
@@ -160,4 +160,5 @@ void KeyFilter::timerEvent(QTimerEvent* e) | |||
160 | if ( heldButton ) { | 160 | if ( heldButton ) { |
161 | emit activate(heldButton, TRUE); | 161 | emit activate(heldButton, TRUE); |
162 | firedHeldButton = heldButton; | ||
162 | heldButton = 0; | 163 | heldButton = 0; |
163 | } | 164 | } |
@@ -203,4 +204,5 @@ bool KeyFilter::checkButtonAction(bool db, int keycode, int press, int autoRepe | |||
203 | return TRUE; | 204 | return TRUE; |
204 | 205 | ||
206 | // odebug << " KeyFilter::checkButtonAction("<<db<<","<<keycode<<","<<press<<","<<autoRepeat<<")"<<oendl; | ||
205 | /* check if it was registered */ | 207 | /* check if it was registered */ |
206 | if (!db ) { | 208 | if (!db ) { |
@@ -208,9 +210,17 @@ bool KeyFilter::checkButtonAction(bool db, int keycode, int press, int autoRepe | |||
208 | return true; | 210 | return true; |
209 | } else { | 211 | } else { |
210 | |||
211 | // First check to see if DeviceButtonManager knows something about this button: | 212 | // First check to see if DeviceButtonManager knows something about this button: |
212 | const ODeviceButton* button = ODevice::inst()->buttonForKeycode(keycode); | 213 | const ODeviceButton* button = ODevice::inst()->buttonForKeycode(keycode); |
213 | if (button && !autoRepeat) { | 214 | if (button && !autoRepeat) { |
214 | if ( held_tid ) { | 215 | if (firedHeldButton) { |
216 | if (held_tid) { | ||
217 | killTimer(held_tid); | ||
218 | held_tid = 0; | ||
219 | } | ||
220 | if (!press && button == firedHeldButton) { | ||
221 | firedHeldButton = 0; | ||
222 | return TRUE; | ||
223 | } | ||
224 | } else if ( held_tid && heldButton != button) { | ||
215 | killTimer(held_tid); | 225 | killTimer(held_tid); |
216 | held_tid = 0; | 226 | held_tid = 0; |
@@ -220,6 +230,8 @@ bool KeyFilter::checkButtonAction(bool db, int keycode, int press, int autoRepe | |||
220 | emit activate(button, FALSE); | 230 | emit activate(button, FALSE); |
221 | } else if ( press ) { | 231 | } else if ( press ) { |
222 | heldButton = button; | 232 | if (heldButton != button) { |
223 | held_tid = startTimer( ODevice::inst ()->buttonHoldTime () ); | 233 | heldButton = button; |
234 | held_tid = startTimer( ODevice::inst ()->buttonHoldTime () ); | ||
235 | } | ||
224 | } else if ( heldButton ) { | 236 | } else if ( heldButton ) { |
225 | heldButton = 0; | 237 | heldButton = 0; |
diff --git a/core/launcher/serverapp.h b/core/launcher/serverapp.h index 27be28b..98c5633 100644 --- a/core/launcher/serverapp.h +++ b/core/launcher/serverapp.h | |||
@@ -82,5 +82,5 @@ private: | |||
82 | bool keyRegistered( int key ); | 82 | bool keyRegistered( int key ); |
83 | int held_tid; | 83 | int held_tid; |
84 | const Opie::Core::ODeviceButton* heldButton; | 84 | const Opie::Core::ODeviceButton* heldButton,*firedHeldButton; |
85 | KeyRegisterList m_keys; | 85 | KeyRegisterList m_keys; |
86 | }; | 86 | }; |