Changeset 26936 in vbox for trunk/src/VBox/Frontends

Timestamp:

Mar 2, 2010 10:45:01 AM (15 years ago)

Author:

vboxsync

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

58224

Message:

VBoxManage: Added support for querying and setting HID types.

Location:

trunk/src/VBox/Frontends/VBoxManage

Files:

• VBoxManageHelp.cpp (modified) (1 diff)
• VBoxManageInfo.cpp (modified) (1 diff)
• VBoxManageModifyVM.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp

@@ -209 +209 @@
                  "                            [--natnet<1-N> <network>|default]\n"
                  "                            [--macaddress<1-N> auto|<mac>]\n"
+                 "                            [--mouse ps2|usb|usbtablet\n"
+                 "                            [--keyboard ps2|usb\n"
                  "                            [--uart<1-N> off|<I/O base> <IRQ>]\n"
                  "                            [--uartmode<1-N> disconnected|\n"

trunk/src/VBox/Frontends/VBoxManage/VBoxManageInfo.cpp

@@ -867 +867 @@
     }
 
+    /* Pointing device information */
+    PointingHidType_T aPointingHid;
+    const char *pszHid = "Unknown";
+    const char *pszMrHid = "unknown";
+    machine->COMGETTER(PointingHidType)(&aPointingHid);
+    switch (aPointingHid)
+    {
+        case PointingHidType_None:
+            pszHid = "None";
+            pszMrHid = "none";
+            break;
+        case PointingHidType_PS2Mouse:
+            pszHid = "PS/2 Mouse";
+            pszMrHid = "ps2mouse";
+            break;
+        case PointingHidType_USBMouse:
+            pszHid = "USB Mouse";
+            pszMrHid = "usbmouse";
+            break;
+        case PointingHidType_USBTablet:
+            pszHid = "USB Tablet";
+            pszMrHid = "usbtablet";
+            break;
+        case PointingHidType_ComboMouse:
+            pszHid = "USB Tablet and PS/2 Mouse";
+            pszMrHid = "combomouse";
+            break;
+        default:
+            break;
+    }
+    if (details == VMINFO_MACHINEREADABLE)
+        RTPrintf("hidpointing=\"%s\"\n", pszMrHid);
+    else
+        RTPrintf("Pointing Device: %s\n", pszHid);
+
+    /* Keyboard device information */
+    KeyboardHidType_T aKeyboardHid;
+    machine->COMGETTER(KeyboardHidType)(&aKeyboardHid);
+    pszHid = "Unknown";
+    pszMrHid = "unknown";
+    switch (aKeyboardHid)
+    {
+        case KeyboardHidType_None:
+            pszHid = "None";
+            pszMrHid = "none";
+            break;
+        case KeyboardHidType_PS2Keyboard:
+            pszHid = "PS/2 Keyboard";
+            pszMrHid = "ps2kbd";
+            break;
+        case KeyboardHidType_USBKeyboard:
+            pszHid = "USB Keyboard";
+            pszMrHid = "usbkbd";
+            break;
+        case KeyboardHidType_ComboKeyboard:
+            pszHid = "USB and PS/2 Keyboard";
+            pszMrHid = "combokbd";
+            break;
+        default:
+            break;
+    }
+    if (details == VMINFO_MACHINEREADABLE)
+        RTPrintf("hidkeyboard=\"%s\"\n", pszMrHid);
+    else
+        RTPrintf("Keyboard Device: %s\n", pszHid);
+
     /* get the maximum amount of UARTs */
     ULONG maxUARTs = 0;

trunk/src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp

@@ -115 +115 @@
     MODIFYVM_NATNET,
     MODIFYVM_MACADDRESS,
+    MODIFYVM_HIDPTR,
+    MODIFYVM_HIDKBD,
     MODIFYVM_UARTMODE,
     MODIFYVM_UART,
@@ -203 +205 @@
     { "--natnet",                   MODIFYVM_NATNET,                    RTGETOPT_REQ_STRING | RTGETOPT_FLAG_INDEX },
     { "--macaddress",               MODIFYVM_MACADDRESS,                RTGETOPT_REQ_STRING | RTGETOPT_FLAG_INDEX },
+    { "--mouse",                    MODIFYVM_HIDPTR,                    RTGETOPT_REQ_STRING },
+    { "--keyboard",                 MODIFYVM_HIDKBD,                    RTGETOPT_REQ_STRING },
     { "--uartmode",                 MODIFYVM_UARTMODE,                  RTGETOPT_REQ_STRING | RTGETOPT_FLAG_INDEX },
     { "--uart",                     MODIFYVM_UART,                      RTGETOPT_REQ_STRING | RTGETOPT_FLAG_INDEX },
@@ -1214 +1218 @@
             }
 
+            case MODIFYVM_HIDPTR:
+            {
+                if (!strcmp(ValueUnion.psz, "ps2"))
+                {
+                    CHECK_ERROR(machine, COMSETTER(PointingHidType)(PointingHidType_PS2Mouse));
+                }
+                else if (!strcmp(ValueUnion.psz, "usb"))
+                {
+                    CHECK_ERROR(machine, COMSETTER(PointingHidType)(PointingHidType_USBMouse));
+                }
+                else if (!strcmp(ValueUnion.psz, "usbtablet"))
+                {
+                    CHECK_ERROR(machine, COMSETTER(PointingHidType)(PointingHidType_USBTablet));
+                }
+                else
+                {
+                    errorArgument("Invalid type '%s' specfied for pointing device", ValueUnion.psz);
+                    rc = E_FAIL;
+                }
+                break;
+            }
+
+            case MODIFYVM_HIDKBD:
+            {
+                if (!strcmp(ValueUnion.psz, "ps2"))
+                {
+                    CHECK_ERROR(machine, COMSETTER(KeyboardHidType)(KeyboardHidType_PS2Keyboard));
+                }
+                else if (!strcmp(ValueUnion.psz, "usb"))
+                {
+                    CHECK_ERROR(machine, COMSETTER(KeyboardHidType)(KeyboardHidType_USBKeyboard));
+                }
+                else
+                {
+                    errorArgument("Invalid type '%s' specfied for keyboard", ValueUnion.psz);
+                    rc = E_FAIL;
+                }
+                break;
+            }
+
             case MODIFYVM_UARTMODE:
             {