Changeset 43405 in vbox for trunk/src

Timestamp:

Sep 22, 2012 1:53:03 PM (12 years ago)

Author:

vboxsync

Message:

Additions/haiku: cleanup.

Location:

trunk/src/VBox/Additions/haiku/VBoxMouse

Files:

• VBoxMouse.cpp (modified) (8 diffs)
• VBoxMouse.h (modified) (2 diffs)
• VBoxMouseFilter.cpp (modified) (4 diffs)
• VBoxMouseFilter.h (modified) (2 diffs)

trunk/src/VBox/Additions/haiku/VBoxMouse/VBoxMouse.cpp

@@ -70 +70 @@
 
 
+static inline int vboxMouseAcquire()
+{
+    uint32_t fFeatures = 0;
+    int rc = VbglR3GetMouseStatus(&fFeatures, NULL, NULL);
+    if (RT_SUCCESS(rc))
+    {
+        rc = VbglR3SetMouseStatus(fFeatures | VMMDEV_MOUSE_GUEST_CAN_ABSOLUTE | VMMDEV_MOUSE_NEW_PROTOCOL);
+        if (RT_FAILURE(rc))
+            LogRel(("VbglR3SetMouseStatus failed. rc=%d\n", rc));
+    }
+    else
+        LogRel(("VbglR3GetMouseStatus failed. rc=%d\n", rc));
+    return rc;
+}
+
+
+static inline int vboxMouseRelease()
+{
+    uint32_t fFeatures = 0;
+    int rc = VbglR3GetMouseStatus(&fFeatures, NULL, NULL);
+    if (RT_SUCCESS(rc))
+    {
+        rc = VbglR3SetMouseStatus(fFeatures & ~VMMDEV_MOUSE_GUEST_CAN_ABSOLUTE & ~VMMDEV_MOUSE_NEW_PROTOCOL);
+        if (RT_FAILURE(rc))
+            LogRel(("VbglR3SetMouseStatus failed. rc=%d\n", rc));
+    }
+    else
+        LogRel(("VbglR3GetMouseStatus failed. rc=%d\n", rc));
+    return rc;
+}
+
+
 VBoxMouse::VBoxMouse()
      : BInputServerDevice(),
@@ -114 +146 @@
 status_t VBoxMouse::Start(const char *device, void *cookie)
 {
+#if 0
     status_t err;
     int rc;
@@ -149 +182 @@
 
     return B_ERROR;
+#endif
+
+    status_t err = B_OK;
+    int rc;
+    uint32_t fFeatures = 0;
+    LogFlowFunc(("device=%s cookie=%p\n", device, cookie));
+
+    rc = vboxMouseAcquire();
+    if (RT_SUCCESS(rc))
+    {
+        err = fServiceThreadID = spawn_thread(_ServiceThreadNub, "VBoxMouse", B_NORMAL_PRIORITY, this);
+        if (err >= B_OK)
+        {
+            resume_thread(fServiceThreadID);
+            return B_OK;
+        }
+        else
+            LogRel(("VBoxMouse::Start Error starting service thread: 0x%08lx\n", err));
+
+        vboxMouseRelease();
+        err = B_ERROR;
+    }
+    else
+    {
+        LogRel(("VBoxMouse::Start vboxMouseAcquire failed. rc=%d\n", rc));
+        err = B_DEVICE_NOT_FOUND;
+    }
+
+    return err;
 }
 
@@ -161 +223 @@
     fExiting = true;
 
-
-    rc = VbglR3GetMouseStatus(&fFeatures, NULL, NULL);
-    if (RT_SUCCESS(rc))
-        rc = VbglR3SetMouseStatus(fFeatures
-                                  & ~VMMDEV_MOUSE_GUEST_CAN_ABSOLUTE
-                                  & ~VMMDEV_MOUSE_NEW_PROTOCOL);
-
+    vboxMouseRelease();
 
     close(fDriverFD);
@@ -183 +239 @@
 status_t VBoxMouse::Control(const char *device, void *cookie, uint32 code, BMessage *message)
 {
-    // respond to changes in the system
     switch (code)
     {
@@ -216 +271 @@
         uint32_t cx, cy, fFeatures;
         int rc;
-
 
         fd_set readSet, writeSet, errorSet;
@@ -233 +287 @@
         }
 
-        if (RT_SUCCESS(VbglR3GetMouseStatus(&fFeatures, &cx, &cy))
+        int rc = VbglR3GetMouseStatus(&fFeatures, &cx, &cy);
+        if (   RT_SUCCESS(rc)
             && (fFeatures & VMMDEV_MOUSE_HOST_WANTS_ABSOLUTE))
         {
@@ -241 +296 @@
             _debugPrintf("VBoxMouse: at %d,%d %f,%f\n", cx, cy, x, y);
 
-            /* send absolute movement */
-
+            /* Send absolute movement */
             bigtime_t now = system_time();
             BMessage *event = new BMessage(B_MOUSE_MOVED);

trunk/src/VBox/Additions/haiku/VBoxMouse/VBoxMouse.h

@@ -50 +50 @@
 #include <InputServerDevice.h>
 
-extern "C"
-_EXPORT BInputServerDevice* instantiate_input_device();
+extern "C" _EXPORT BInputServerDevice* instantiate_input_device();
 
 class VBoxMouse : public BInputServerDevice
@@ -59 +58 @@
         virtual ~VBoxMouse();
 
-        virtual status_t                InitCheck();
-        virtual status_t                SystemShuttingDown();
+        virtual status_t        InitCheck();
+        virtual status_t        SystemShuttingDown();
 
-        virtual status_t                Start(const char *device, void *cookie);
-        virtual status_t                Stop(const char *device, void *cookie);
-        virtual status_t                Control(const char      *device,
-                                  void          *cookie,
-                                  uint32                code,
-                                  BMessage      *message);
+        virtual status_t        Start(const char *device, void *cookie);
+        virtual status_t        Stop(const char *device, void *cookie);
+        virtual status_t        Control(const char *device, void *cookie, uint32 code, BMessage *message);
 
     private:
 
-        static status_t _ServiceThreadNub(void *_this);
-        status_t        _ServiceThread();
+        static status_t         _ServiceThreadNub(void *_this);
+        status_t                _ServiceThread();
 
-        int                     fDriverFD;
-        thread_id       fServiceThreadID;
-        bool            fExiting;
-
+        int                     fDriverFD;
+        thread_id               fServiceThreadID;
+        bool                    fExiting;
 };
-
 
 #endif /* __VBOXMOUSE__H */

trunk/src/VBox/Additions/haiku/VBoxMouse/VBoxMouseFilter.cpp

@@ -62 +62 @@
 #include <iprt/err.h>
 
-// TODO can this be merged with VBoxMouse?
+/* @todo can this be merged with VBoxMouse? */
 
 RTDECL(BInputServerFilter *)
@@ -79 +79 @@
 }
 
+
 VBoxMouseFilter::~VBoxMouseFilter()
 {
 }
+
 
 filter_result VBoxMouseFilter::Filter(BMessage *message, BList *outList)
@@ -92 +94 @@
             printf("click|release\n");
             message->FindInt32("buttons", &fCurrentButtons);
+            /** @todo r=ramshankar this looks wrong, no 'break' here? */
         }
+
         case B_MOUSE_MOVED:
         {
             printf("mouse moved\n");
             message->ReplaceInt32("buttons", fCurrentButtons);
+            /** @todo r=ramshankar: 'break' or explicit comment please. */
         }
     }
@@ -102 +107 @@
     return B_DISPATCH_MESSAGE;
 }
+

trunk/src/VBox/Additions/haiku/VBoxMouse/VBoxMouseFilter.h

@@ -45 +45 @@
  */
 
-#ifndef __VBOXMOUSE__H
-#define __VBOXMOUSE__H
+#ifndef __VBOXMOUSE_FILTER__H
+#define __VBOXMOUSE_FILTER__H
 
 #include <InputServerFilter.h>
@@ -52 +52 @@
 extern "C" _EXPORT BInputServerFilter* instantiate_input_filter();
 
-class VBoxMouseFilter : public BInputServerFilter {
-public:
-        VBoxMouseFilter();
-        virtual ~VBoxMouseFilter();
-//      virtual status_t InitCheck();
-        virtual filter_result Filter(BMessage* message, BList* outList);
+class VBoxMouseFilter : public BInputServerFilter
+{
+    public:
+        VBoxMouseFilter();
+        virtual ~VBoxMouseFilter();
 
-private:
+        virtual filter_result       Filter(BMessage* message, BList* outList);
 
-static status_t _ServiceThreadNub(void *_this);
-        status_t        _ServiceThread();
+    private:
+        static status_t             _ServiceThreadNub(void *_this);
+        status_t                    _ServiceThread();
 
-        int                     fDriverFD;
-        thread_id       fServiceThreadID;
-        bool            fExiting;
-        bool            fEnabled;
-        int32           fCurrentButtons;
+        int                         fDriverFD;
+        thread_id                   fServiceThreadID;
+        bool                        fExiting;
+        bool                        fEnabled;
+        int32                       fCurrentButtons;
 };
 
+#endif /* __VBOXMOUSE_FILTER__H */
 
-#endif /* __VBOXMOUSE__H */
-