Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed some problems of the EventDispatcher I introduced since I've played

Browse Source 
with the "EventMask" test app the last time:
* The focus view didn't get any mouse messages anymore if there was a permanent
  B_POINTER_EVENTS view.
* B_KEYBOARD_EVENTS now works again.
* B_MOUSE_WHEEL_CHANGED messages no do arrive their targets without prior
  keyboard input.
* Added TODO item that other focus messages don't go through to the app without
  keyboard input (fix only works for B_MOUSE_WHEEL_CHANGED).


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@15754 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler 2005-12-30 20:59:14 +00:00
parent 002356d2c9
commit 9aad1a5754
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/servers/app/EventDispatcher.cpp
View File

@ -707,6 +707,7 @@ EventDispatcher::_EventLoop()
// that the mouse has exited its views
addedTokens = _AddTokens(event, fPreviousMouseTarget,
B_POINTER_EVENTS);
_SendMessage(fPreviousMouseTarget->Messenger(), event,
kMouseTransitImportance);
previous = fPreviousMouseTarget;
@ -718,6 +719,8 @@ EventDispatcher::_EventLoop()
addedTokens |= _AddTokens(event, current, B_POINTER_EVENTS);
if (viewToken != B_NULL_TOKEN)
event->AddInt32("_view_token", viewToken);
if (addedTokens)
_SetFeedFocus(event);
_SendMessage(current->Messenger(), event, event->what == B_MOUSE_MOVED
? kMouseMovedImportance : kStandardImportance);
@ -738,7 +741,7 @@ EventDispatcher::_EventLoop()
keyboardEvent = true;
if (current != NULL && _AddTokens(event, fFocus, B_KEYBOARD_EVENTS)) {
if (fFocus != NULL && _AddTokens(event, fFocus, B_KEYBOARD_EVENTS)) {
// if tokens were added, we need to explicetly suspend
// focus in the event - if not, the event is simply not
// forwarded to the target
@ -751,7 +754,13 @@ EventDispatcher::_EventLoop()
// supposed to fall through
default:
current = fFocus;
// TODO: the keyboard filter sets the focus - ie. no other
// focus messages that go through the event dispatcher can
// go through.
if (event->what == B_MOUSE_WHEEL_CHANGED)
current = fPreviousMouseTarget;
else
current = fFocus;
if (current != NULL && (!fSuspendFocus || addedTokens))
_SendMessage(current->Messenger(), event, kStandardImportance);