-rw-r--r-- | noncore/applets/zkbapplet/keyzcfg/zkb.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/noncore/applets/zkbapplet/keyzcfg/zkb.cpp b/noncore/applets/zkbapplet/keyzcfg/zkb.cpp index a357b88..3cc3669 100644 --- a/noncore/applets/zkbapplet/keyzcfg/zkb.cpp +++ b/noncore/applets/zkbapplet/keyzcfg/zkb.cpp | |||
@@ -246,52 +246,53 @@ Keymap::Keymap():enabled(true), currentState(0), autoRepeatAction(0), repeater(t | |||
246 | connect(&repeater, SIGNAL(timeout()), this, SLOT(autoRepeat())); | 246 | connect(&repeater, SIGNAL(timeout()), this, SLOT(autoRepeat())); |
247 | } | 247 | } |
248 | 248 | ||
249 | Keymap::~Keymap() { | 249 | Keymap::~Keymap() { |
250 | odebug << "removing keyboard filter for zkb"<<oendl; | 250 | odebug << "removing keyboard filter for zkb"<<oendl; |
251 | Opie::Core::OKeyFilter::inst()->remHandler(this); | 251 | Opie::Core::OKeyFilter::inst()->remHandler(this); |
252 | QMap<QString, State*>::Iterator it; | 252 | QMap<QString, State*>::Iterator it; |
253 | for(it = states.begin(); it != states.end(); ++it) { | 253 | for(it = states.begin(); it != states.end(); ++it) { |
254 | delete it.data(); | 254 | delete it.data(); |
255 | } | 255 | } |
256 | states.clear(); | 256 | states.clear(); |
257 | } | 257 | } |
258 | 258 | ||
259 | bool Keymap::filter(int unicode, int keycode, int modifiers, | 259 | bool Keymap::filter(int unicode, int keycode, int modifiers, |
260 | bool isPress, bool autoRepeat) { | 260 | bool isPress, bool autoRepeat) { |
261 | 261 | ||
262 | odebug << "filter: >>> unicode=" << unicode << ", keycode=" << keycode | ||
263 | << ", modifiers=" << modifiers << ", ispressed=" << isPress << oendl; | ||
264 | |||
265 | if (!enabled) { | 262 | if (!enabled) { |
266 | return false; | 263 | return false; |
267 | } | 264 | } |
268 | 265 | ||
266 | odebug << "filter: >>> unicode=" << unicode << ", keycode=" << keycode | ||
267 | << ", modifiers=" << modifiers << ", ispressed=" << isPress << oendl; | ||
268 | |||
269 | // the second check is workaround to make suspend work if | 269 | // the second check is workaround to make suspend work if |
270 | // the user pressed it right after he did resume. for some | 270 | // the user pressed it right after he did resume. for some |
271 | // reason the event sent by qt has autoRepeat true in this | 271 | // reason the event sent by qt has autoRepeat true in this |
272 | // case | 272 | // case |
273 | if (autoRepeat && keycode != 4177) { | 273 | if (autoRepeat && keycode != 4177) { |
274 | return true; | 274 | return true; |
275 | } | 275 | } |
276 | 276 | ||
277 | (void) unicode; (void) modifiers; | 277 | (void) unicode; (void) modifiers; |
278 | 278 | ||
279 | Action* action = currentState->get(keycode, isPress, true); | 279 | Action* action = currentState->get(keycode, isPress, true); |
280 | if (action==0 || !action->isDefined()) { | 280 | if (action==0 || !action->isDefined()) { |
281 | return true; | 281 | odebug << "no action defined for that"<<oendl; |
282 | return false; | ||
282 | } | 283 | } |
283 | 284 | ||
284 | if (action->hasEvent()) { | 285 | if (action->hasEvent()) { |
285 | odebug << "filter:<<< unicode=" << action->getUnicode() << ", keycode=" << action->getKeycode() | 286 | odebug << "filter:<<< unicode=" << action->getUnicode() << ", keycode=" << action->getKeycode() |
286 | << ", modifiers=" << action->getModifiers() << ", ispressed=" << action->isPressed() << oendl; | 287 | << ", modifiers=" << action->getModifiers() << ", ispressed=" << action->isPressed() << oendl; |
287 | 288 | ||
288 | QWSServer::sendKeyEvent(action->getUnicode(), | 289 | QWSServer::sendKeyEvent(action->getUnicode(), |
289 | action->getKeycode(), action->getModifiers(), | 290 | action->getKeycode(), action->getModifiers(), |
290 | action->isPressed(), false); | 291 | action->isPressed(), false); |
291 | } | 292 | } |
292 | 293 | ||
293 | if (action->isAutorepeat()) { | 294 | if (action->isAutorepeat()) { |
294 | autoRepeatAction = action; | 295 | autoRepeatAction = action; |
295 | repeater.start(repeatDelay, TRUE); | 296 | repeater.start(repeatDelay, TRUE); |
296 | } else { | 297 | } else { |
297 | autoRepeatAction = 0; | 298 | autoRepeatAction = 0; |