Ticket #8007: 0002-Move-B_MOUSE_IDLE-generation-to-app_server.patch

headers/os/interface/Window.h

@@ -369 +369 @@
             BView*              fTopView;
             BView*              fFocus;
             BView*              fLastMouseMovedView;
-            BMessageRunner*     fIdleMouseRunner;
+            uint32              _unused1;
             BMenuBar*           fKeyMenuBar;
             BButton*            fDefaultButton;
             BList               fShortcuts;

src/kits/interface/Window.cpp

@@ -1315 +1315 @@
                 message->FindPoint("be:view_where", &where);
                 message->FindInt32("buttons", (int32*)&buttons);
 
-                delete fIdleMouseRunner;
-
-                if (transit != B_EXITED_VIEW && transit != B_OUTSIDE_VIEW) {
-                    // Start new idle runner
-                    BMessage idle(B_MOUSE_IDLE);
-                    idle.AddPoint("be:view_where", where);
-                    fIdleMouseRunner = new BMessageRunner(
-                        BMessenger(NULL, this), &idle,
-                        BToolTipManager::Manager()->ShowDelay(), 1);
-                } else {
-                    fIdleMouseRunner = NULL;
+                if (transit == B_EXITED_VIEW || transit == B_OUTSIDE_VIEW) {
                     if (dynamic_cast<BPrivate::ToolTipWindow*>(this) == NULL)
                         BToolTipManager::Manager()->HideTip();
                 }
@@ -2794 +2784 @@
     fTopView = NULL;
     fFocus = NULL;
     fLastMouseMovedView = NULL;
-    fIdleMouseRunner = NULL;
     fKeyMenuBar = NULL;
     fDefaultButton = NULL;
 

src/servers/app/EventDispatcher.cpp

@@ -22 +22 @@
 #include <TokenSpace.h>
 
 #include <Autolock.h>
+#include <ToolTipManager.h>
 #include <View.h>
 
 #include <new>
@@ -817 +818 @@
             }
             case B_MOUSE_DOWN:
             case B_MOUSE_UP:
+            case B_MOUSE_IDLE:
             {
 #ifdef TRACE_EVENTS
                 if (event->what != B_MOUSE_MOVED)
@@ -1002 +1004 @@
 EventDispatcher::_CursorLoop()
 {
     BPoint where;
-    while (fStream->GetNextCursorPosition(where)) {
-        BAutolock _(fCursorLock);
-
-        if (fHWInterface != NULL)
-            fHWInterface->MoveCursorTo(where.x, where.y);
+    const bigtime_t toolTipDelay = BToolTipManager::Manager()->ShowDelay(); 
+    bool mouseIdleSent = true;
+    status_t status = B_OK;
+    
+    while (status != B_ERROR) {
+        const bigtime_t timeout = mouseIdleSent ?
+            B_INFINITE_TIMEOUT : toolTipDelay;
+        status = fStream->GetNextCursorPosition(where, timeout);
+        
+        if (status == B_OK) {
+            mouseIdleSent = false;
+            BAutolock _(fCursorLock);
+
+            if (fHWInterface != NULL)
+                fHWInterface->MoveCursorTo(where.x, where.y);
+        } else if (status == B_TIMED_OUT) {
+            mouseIdleSent = true;
+            BMessage* mouseIdle = new BMessage(B_MOUSE_IDLE);
+            mouseIdle->AddPoint("be:view_where", fLastCursorPosition);
+            fStream->InsertEvent(mouseIdle);
+        }
     }
 
     fCursorThread = -1;

src/servers/app/EventStream.cpp

@@ -35 +35 @@
 }
 
 
-bool
-EventStream::GetNextCursorPosition(BPoint& where)
+status_t
+EventStream::GetNextCursorPosition(BPoint& where, bigtime_t timeout)
 {
-    return false;
+    return B_ERROR;
 }
 
 
@@ -155 +155 @@
 }
 
 
-bool
-InputServerStream::GetNextCursorPosition(BPoint &where)
+status_t
+InputServerStream::GetNextCursorPosition(BPoint &where, bigtime_t timeout)
 {
     status_t status;
+
     do {
-        status = acquire_sem(fCursorSemaphore);
+        status = acquire_sem_etc(fCursorSemaphore, 1, B_RELATIVE_TIMEOUT,
+            timeout);
     } while (status == B_INTERRUPTED);
 
+    if (status == B_TIMED_OUT)
+        return status;
+
     if (status == B_BAD_SEM_ID) {
         // the semaphore is no longer valid - the input_server must have died
         fCursorSemaphore = -1;
-        return false;
+        return B_ERROR;
     }
 
 #ifdef HAIKU_TARGET_PLATFORM_HAIKU
@@ -184 +189 @@
 
     if (fQuitting) {
         fQuitting = false;
-        return false;
+        return B_ERROR;
     }
 
-    return true;
+    return B_OK;
 }
 
 

src/servers/app/EventStream.h

@@ -30 +30 @@
         virtual void UpdateScreenBounds(BRect bounds) = 0;
 
         virtual bool GetNextEvent(BMessage** _event) = 0;
-        virtual bool GetNextCursorPosition(BPoint& where);
+        virtual status_t GetNextCursorPosition(BPoint& where,
+                bigtime_t timeout = B_INFINITE_TIMEOUT);
 
         virtual status_t InsertEvent(BMessage* event) = 0;
 
@@ -55 +56 @@
         virtual void UpdateScreenBounds(BRect bounds);
 
         virtual bool GetNextEvent(BMessage** _event);
-        virtual bool GetNextCursorPosition(BPoint& where);
+        virtual status_t GetNextCursorPosition(BPoint& where,
+                bigtime_t timeout = B_INFINITE_TIMEOUT);
 
         virtual status_t InsertEvent(BMessage* event);