Changeset 26982 in vbox for trunk/src/VBox

Timestamp:

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

Author:

vboxsync

Message:

FE/BFE: VBoxBFE now uses MouseImpl from Main

Location:

trunk/src/VBox

Files:

• Frontends/VBoxBFE/Makefile.kmk (modified) (4 diffs)
• Frontends/VBoxBFE/MouseImpl.cpp (deleted)
• Frontends/VBoxBFE/MouseImpl.h (deleted)
• Main/MouseImpl.cpp (modified) (2 diffs)
• Main/include/MouseImpl.h (modified) (3 diffs)

trunk/src/VBox/Frontends/VBoxBFE/Makefile.kmk

@@ -23 +23 @@
 include $(KBUILD_PATH)/subheader.kmk
 if !defined(VBOX_WITH_HARDENING) || "$(KBUILD_TARGET)" != "darwin"  # No hardened VBoxBFE on darwin (.m).
+
+#
+# Files from Main needed for building VBoxBFE
+#
+VBOXBFE_MAIN_CPP = MouseImpl.cpp
+VBOXBFE_MAIN_H   = MouseImpl.h ConsoleEvents.h
 
 #
@@ -70 +76 @@
         VMMDevInterface.cpp \
         DisplayImpl.cpp \
-        MouseImpl.cpp \
+        $(PATH_VBoxBFE)/MouseImpl.cpp \
         KeyboardImpl.cpp \
         StatusImpl.cpp \
@@ -117 +123 @@
 VBoxBFE_INCS = \
         $(PATH_VBoxBFE) \
-        $(VBOX_PATH_SDK)/include
+        $(VBOX_PATH_SDK)/include \
+        $(PATH_ROOT)/src/VBox/Frontends/VBoxBFE
 ifneq ($(filter-out win os2 l4 darwin,$(KBUILD_TARGET)),) # X11
 VBoxBFE_INCS += \
@@ -166 +173 @@
         $(QUIET)$(VBOX_BIN2C) Ico64x01 $< $@
 
+VBoxBFE_DEPS += $(addprefix $(PATH_VBoxBFE)/,$(VBOXBFE_MAIN_CPP) $(VBOXBFE_MAIN_H))
+
+# Pattern rules for copying needed files from Main
+$(addprefix $$(PATH_VBoxBFE)/,$(VBOXBFE_MAIN_CPP)): \
+                $$(PATH_VBoxBFE)/% : $(PATH_ROOT)/src/VBox/Main/% | $$(dir $$@)
+        $(call MSG_INST_FILE,$<,$@)
+        $(QUIET)$(CP_EXT) $< $@
+
+$(addprefix $$(PATH_VBoxBFE)/,$(VBOXBFE_MAIN_H)): \
+                $$(PATH_VBoxBFE)/% : $(PATH_ROOT)/src/VBox/Main/include/% | $$(dir $$@)
+        $(call MSG_INST_FILE,$<,$@)
+        $(QUIET)$(CP_EXT) $< $@
+
+
 
 endif # !VBOX_WITH_HARDENING || !darwin

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: */