i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

EventDispatcher: Style fixes

Browse Source
This commit is contained in:
John Scipione
2013-12-13 01:32:38 -05:00
parent 7888f1d6ea
commit 8f5d92f98d
2 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/servers/app/EventDispatcher.cpp
+13 -7
View File
@@ -132,8 +132,10 @@ EventTarget::_RemoveTemporaryListener(event_listener* listener, int32 index)
} }
if (listener->temporary_event_mask != 0) { if (listener->temporary_event_mask != 0) {
ETRACE(("events: clear temp. listener: token %ld, eventMask = %ld, options = %ld\n", ETRACE(("events: clear temp. listener: token %ld, eventMask = %ld, "
listener->token, listener->temporary_event_mask, listener->temporary_options)); "options = %ld\n",
listener->token, listener->temporary_event_mask,
listener->temporary_options));
listener->temporary_event_mask = 0; listener->temporary_event_mask = 0;
listener->temporary_options = 0; listener->temporary_options = 0;
@@ -230,7 +232,8 @@ EventFilter::RemoveTarget(EventTarget* target)
EventDispatcher::EventDispatcher() EventDispatcher::EventDispatcher()
: BLocker("event dispatcher"), :
BLocker("event dispatcher"),
fStream(NULL), fStream(NULL),
fThread(-1), fThread(-1),
fCursorThread(-1), fCursorThread(-1),
@@ -390,7 +393,8 @@ EventDispatcher::_AddListener(EventTarget& target, int32 token,
if (eventMask == 0) if (eventMask == 0)
return false; return false;
ETRACE(("events: add listener: token %ld, eventMask = %ld, options = %ld, %s\n", ETRACE(("events: add listener: token %ld, eventMask = %ld, options = %ld,"
"%s\n",
token, eventMask, options, temporary ? "temporary" : "permanent")); token, eventMask, options, temporary ? "temporary" : "permanent"));
// we need a new target // we need a new target
@@ -905,8 +909,10 @@ EventDispatcher::_EventLoop()
ETRACE(("key event, focus = %p\n", fFocus)); ETRACE(("key event, focus = %p\n", fFocus));
if (fKeyboardFilter != NULL if (fKeyboardFilter != NULL
&& fKeyboardFilter->Filter(event, &fFocus) == B_SKIP_MESSAGE) && fKeyboardFilter->Filter(event, &fFocus)
== B_SKIP_MESSAGE) {
break; break;
}
keyboardEvent = true; keyboardEvent = true;
@@ -1007,12 +1013,12 @@ EventDispatcher::_CursorLoop()
const bigtime_t toolTipDelay = BToolTipManager::Manager()->ShowDelay(); const bigtime_t toolTipDelay = BToolTipManager::Manager()->ShowDelay();
bool mouseIdleSent = true; bool mouseIdleSent = true;
status_t status = B_OK; status_t status = B_OK;
while (status != B_ERROR) { while (status != B_ERROR) {
const bigtime_t timeout = mouseIdleSent ? const bigtime_t timeout = mouseIdleSent ?
B_INFINITE_TIMEOUT : toolTipDelay; B_INFINITE_TIMEOUT : toolTipDelay;
status = fStream->GetNextCursorPosition(where, timeout); status = fStream->GetNextCursorPosition(where, timeout);
if (status == B_OK) { if (status == B_OK) {
mouseIdleSent = false; mouseIdleSent = false;
BAutolock _(fCursorLock); BAutolock _(fCursorLock);
src/servers/app/EventDispatcher.h
+3 -2
View File
@@ -106,8 +106,9 @@ class EventDispatcher : public BLocker {
bool _SendMessage(BMessenger& messenger, BMessage* message, bool _SendMessage(BMessenger& messenger, BMessage* message,
float importance); float importance);
bool _AddTokens(BMessage* message, EventTarget* target, uint32 eventMask, bool _AddTokens(BMessage* message, EventTarget* target,
BMessage* nextMouseMoved = NULL, int32* _viewToken = NULL); uint32 eventMask, BMessage* nextMouseMoved = NULL,
int32* _viewToken = NULL);
void _RemoveTokens(BMessage* message); void _RemoveTokens(BMessage* message);
void _SetFeedFocus(BMessage* message); void _SetFeedFocus(BMessage* message);
void _UnsetFeedFocus(BMessage* message); void _UnsetFeedFocus(BMessage* message);