Changeset 27382 in vbox

Timestamp:

Mar 15, 2010 9:19:53 PM (15 years ago)

Author:

vboxsync

Message:

Main, QT/FE: USB tablet HID recommendation, activated for OSX guests only

Location:

trunk/src/VBox

Files:

• Frontends/VirtualBox/src/wizards/newvm/UINewVMWzd.cpp (modified) (1 diff)
• Main/Global.cpp (modified) (1 diff)
• Main/GuestOSTypeImpl.cpp (modified) (1 diff)
• Main/idl/VirtualBox.xidl (modified) (1 diff)
• Main/include/Global.h (modified) (1 diff)
• Main/include/GuestOSTypeImpl.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UINewVMWzd.cpp

@@ -692 +692 @@
     {
         m_Machine.SetKeyboardHidType(KKeyboardHidType_USBKeyboard);
-        m_Machine.SetPointingHidType(KPointingHidType_USBMouse);
+        m_Machine.SetPointingHidType(type.GetRecommendedUsbTablet()  ? 
+                                     KPointingHidType_USBTablet : KPointingHidType_USBMouse);
         if (!usbController.isNull())
             usbController.SetEnabled(true);

trunk/src/VBox/Main/Global.cpp

@@ -157 +157 @@
       VBOXOSTYPE_OS2,             VBOXOSHINT_HWVIRTEX,   96,   4,  2 * _1K, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4 },
     { "MacOS",  "Mac OS X",             SchemaDefs_OSTypeId_MacOS,             "Mac OS X",
-      VBOXOSTYPE_MacOS,           VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_EFI | VBOXOSHINT_PAE | VBOXOSHINT_USBHID | VBOXOSHINT_HPET,  1024,   4,  20 * _1K, NetworkAdapterType_I82543GC, 0, StorageControllerType_ICH6 },
+      VBOXOSTYPE_MacOS,           VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_EFI | VBOXOSHINT_PAE | VBOXOSHINT_USBHID | VBOXOSHINT_HPET | VBOXOSHINT_USBTABLET,  1024,   4,  20 * _1K, NetworkAdapterType_I82543GC, 0, StorageControllerType_ICH6 },
     { "MacOS",  "Mac OS X",             SchemaDefs_OSTypeId_MacOS_64,          "Mac OS X (64 bit)",
-      VBOXOSTYPE_MacOS_x64,       VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_EFI | VBOXOSHINT_PAE |  VBOXOSHINT_64BIT | VBOXOSHINT_USBHID | VBOXOSHINT_HPET,  1024,   4,  20 * _1K, NetworkAdapterType_I82543GC, 0, StorageControllerType_ICH6 },
+      VBOXOSTYPE_MacOS_x64,       VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_EFI | VBOXOSHINT_PAE |  VBOXOSHINT_64BIT | VBOXOSHINT_USBHID | VBOXOSHINT_HPET | VBOXOSHINT_USBTABLET,  1024,   4,  20 * _1K, NetworkAdapterType_I82543GC, 0, StorageControllerType_ICH6 },
     { "Other",   "Other",             SchemaDefs_OSTypeId_DOS,             "DOS",
       VBOXOSTYPE_DOS,             VBOXOSHINT_NONE,  32,   4,      512, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4 },

trunk/src/VBox/Main/GuestOSTypeImpl.cpp

@@ -345 +345 @@
 }
 
+STDMETHODIMP GuestOSType::COMGETTER(RecommendedUsbTablet) (BOOL *aRecommendedUsbTablet)
+{
+    CheckComArgOutPointerValid(aRecommendedUsbTablet);
+
+    AutoCaller autoCaller(this);
+    if (FAILED(autoCaller.rc())) return autoCaller.rc();
+
+    /* HID type is constant during life time, no need to lock */
+    *aRecommendedUsbTablet = !!(mOSHint & VBOXOSHINT_USBTABLET);
+
+    return S_OK;
+}
+
 /* vi: set tabstop=4 shiftwidth=4 expandtab: */

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -8418 +8418 @@
     </attribute>
 
+    <attribute name="recommendedUsbTablet" type="boolean" readonly="yes">
+      <desc>Returns @c true if using USB Tablet recommended (only relevant if using USB HIDs).</desc>
+    </attribute>
+
   </interface>
 

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

@@ -43 +43 @@
 #define VBOXOSHINT_USBHID               RT_BIT(5)
 #define VBOXOSHINT_HPET                 RT_BIT(6)
+#define VBOXOSHINT_USBTABLET            RT_BIT(7)
 
 /**

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

@@ -79 +79 @@
     STDMETHOD(COMGETTER(RecommendedUsbHid)) (BOOL *aRecommendedUsbHid);
     STDMETHOD(COMGETTER(RecommendedHpet)) (BOOL *aRecommendedHpet);
+    STDMETHOD(COMGETTER(RecommendedUsbTablet)) (BOOL *aRecommendedUsbTablet);
 
     // public methods only for internal purposes