-rw-r--r-- | core/launcher/serverapp.cpp | 22 |
1 files changed, 17 insertions, 5 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 @@ -141,13 +141,13 @@ void DesktopPowerAlerter::hideEvent( QHideEvent *e ) alertCount = 0; currentPriority = INT_MAX; } //--------------------------------------------------------------------------- -KeyFilter::KeyFilter(QObject* parent) : QObject(parent), held_tid(0), heldButton(0) +KeyFilter::KeyFilter(QObject* parent) : QObject(parent), held_tid(0), heldButton(0),firedHeldButton(0) { /* We don't do this cause it would interfere with ODevice */ #if 0 qwsServer->setKeyboardFilter(this); #endif } @@ -156,12 +156,13 @@ void KeyFilter::timerEvent(QTimerEvent* e) { if ( e->timerId() == held_tid ) { killTimer(held_tid); // button held if ( heldButton ) { emit activate(heldButton, TRUE); + firedHeldButton = heldButton; heldButton = 0; } held_tid = 0; } } @@ -199,31 +200,42 @@ bool KeyFilter::checkButtonAction(bool db, int keycode, int press, int autoRepe && keycode != Key_Left && keycode != Key_Right && keycode != Key_Up && keycode != Key_Down ) return TRUE; +// odebug << " KeyFilter::checkButtonAction("<<db<<","<<keycode<<","<<press<<","<<autoRepeat<<")"<<oendl; /* check if it was registered */ if (!db ) { if (keycode != 0 &&press && !autoRepeat && keyRegistered(keycode) ) return true; } else { - // First check to see if DeviceButtonManager knows something about this button: const ODeviceButton* button = ODevice::inst()->buttonForKeycode(keycode); if (button && !autoRepeat) { - if ( held_tid ) { + if (firedHeldButton) { + if (held_tid) { + killTimer(held_tid); + held_tid = 0; + } + if (!press && button == firedHeldButton) { + firedHeldButton = 0; + return TRUE; + } + } else if ( held_tid && heldButton != button) { killTimer(held_tid); held_tid = 0; } if ( button->heldAction().isNull() ) { if ( press ) emit activate(button, FALSE); } else if ( press ) { - heldButton = button; - held_tid = startTimer( ODevice::inst ()->buttonHoldTime () ); + if (heldButton != button) { + heldButton = button; + held_tid = startTimer( ODevice::inst ()->buttonHoldTime () ); + } } else if ( heldButton ) { heldButton = 0; emit activate(button, FALSE); } QWSServer::screenSaverActivate(FALSE); return TRUE; |