Changeset 26982 in vbox for trunk/src/VBox/Main

Timestamp:

Mar 3, 2010 10:28:21 AM (15 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

58284

Message:

FE/BFE: VBoxBFE now uses MouseImpl from Main

Location:

trunk/src/VBox/Main

Files:

• MouseImpl.cpp (modified) (2 diffs)
• include/MouseImpl.h (modified) (3 diffs)

trunk/src/VBox/Main/MouseImpl.cpp

@@ -120 +120 @@
     mpDrv = NULL;
 
+#ifdef VBOXBFE_WITHOUT_COM
+    mParent = NULL;
+#else
     unconst(mParent).setNull();
+#endif
 }
 
@@ -428 +432 @@
     HRESULT rc = convertDisplayWidth(x, &mouseXAbs);
     ComAssertComRCRet(rc, rc);
-    /// TODO: Remove those strings?
-    //if (mouseXAbs > 0xffff)
-    //    mouseXAbs = mLastAbsX;
+    /**
+     * @todo multi-monitor Windows guests expect this to be unbounded.
+     * Fix for the rest.
+     */
+    /* if (mouseXAbs > 0xffff)
+        mouseXAbs = mLastAbsX; */
 
     uint32_t mouseYAbs;
     rc = convertDisplayHeight(y, &mouseYAbs);
     ComAssertComRCRet(rc, rc);
-    /// TODO: Remove those strings?
-    //if (mouseYAbs > 0xffff)
-    //    mouseYAbs = mLastAbsY;
+    /* if (mouseYAbs > 0xffff)
+        mouseYAbs = mLastAbsY; */
 
     uint32_t fButtons = mouseButtonsToPDM(buttonState);

trunk/src/VBox/Main/include/MouseImpl.h

@@ -53 +53 @@
 
 class ATL_NO_VTABLE Mouse :
-    public VirtualBoxBase,
+    public VirtualBoxBase
+#ifndef VBOXBFE_WITHOUT_COM
+    ,
     public VirtualBoxSupportErrorInfoImpl<Mouse, IMouse>,
     public VirtualBoxSupportTranslation<Mouse>,
     VBOX_SCRIPTABLE_IMPL(IMouse)
+#endif
 {
 public:
@@ -134 +137 @@
     void sendMouseCapsCallback(void);
 
+#ifdef VBOXBFE_WITHOUT_COM
+    Console *mParent;
+#else
     const ComObjPtr<Console, ComWeakRef> mParent;
+#endif
     /** Pointer to the associated mouse driver. */
     struct DRVMAINMOUSE    *mpDrv;
@@ -147 +154 @@
 };
 
+#ifdef VBOXBFE_WITHOUT_COM
+/** @todo make this a member of Console */
+extern Mouse *gMouse;
+
+/** @todo can we get these from the API somehow? */
+enum
+{
+    MouseButtonState_LeftButton = 1,
+    MouseButtonState_RightButton = 2,
+    MouseButtonState_MiddleButton = 4,
+    MouseButtonState_XButton1 = 8,
+    MouseButtonState_XButton2 = 16,
+};
+#endif
+
 #endif // !____H_MOUSEIMPL
 /* vi: set tabstop=4 shiftwidth=4 expandtab: */