Changeset 10430 in vbox

Timestamp:

Jul 9, 2008 2:20:37 PM (17 years ago)

Author:

vboxsync

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

33090

Message:

VBoxSDL: added -nohostkeys parameter to disable dedicated hostkey combinations (customer demanded feature)

File:

• trunk/src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp (modified) (10 diffs)

trunk/src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp

@@ -163 +163 @@
 static int gHostKeySym2 = SDLK_UNKNOWN;
 #endif
+static char *gHostKeyDisabledCombinations;
 static BOOL gfGrabbed = FALSE;
 static BOOL gfGrabOnMouseClick = TRUE;
@@ -645 +646 @@
              "  -nofstoggle              Forbid switching to/from fullscreen mode\n"
              "  -noresize                Make the SDL frame non resizable\n"
-             "  -nohostkey               Disable hostkey\n"
+             "  -nohostkey               Disable all hostkey combinations\n"
+             "  -nohostkeys ...          Disable specific hostkey combinations, see below for valid keys\n"
              "  -nograbonclick           Disable mouse/keyboard grabbing on mouse click w/o additions\n"
              "  -detecthostkey           Get the hostkey identifier and modifier state\n"
@@ -1291 +1293 @@
             gHostKeyMod  = 0;
             gHostKeySym1 = 0;
+        }
+        else if (strcmp(argv[curArg], "-nohostkeys") == 0)
+        {
+            if (++curArg >= argc)
+            {
+                RTPrintf("Error: missing a string of disabled hostkey combinations\n");
+                rc = E_FAIL;
+                break;
+            }
+            gHostKeyDisabledCombinations = argv[curArg];
+            unsigned i, cStr = strlen(gHostKeyDisabledCombinations);
+            for (i=0; i<cStr; i++)
+            {
+                if (!strchr("fhnpqrs", gHostKeyDisabledCombinations[i]))
+                {
+                    RTPrintf("Error: <hostkey> + '%c' is not a valid combination\n",
+                            gHostKeyDisabledCombinations[i]);
+                    rc = E_FAIL;
+                    i = cStr;
+                    break;
+                }
+            }
         }
         else if (strcmp(argv[curArg], "-nograbonclick") == 0)
@@ -4487 +4511 @@
         case SDLK_f:
         {
-            if (gfAllowFullscreenToggle)
-            {
-                /*
-                 * We have to pause/resume the machine during this
-                 * process because there might be a short moment
-                 * without a valid framebuffer
-                 */
-                MachineState_T machineState;
-                gMachine->COMGETTER(State)(&machineState);
-                if (machineState == MachineState_Running)
-                    gConsole->Pause();
-                gpFrameBuffer->setFullscreen(!gpFrameBuffer->getFullscreen());
-                if (machineState == MachineState_Running)
-                    gConsole->Resume();
-
-                /*
-                 * We have switched from/to fullscreen, so request a full
-                 * screen repaint, just to be sure.
-                 */
-                gDisplay->InvalidateAndUpdate();
-            }
+            if (   strchr(gHostKeyDisabledCombinations, 'f')
+                || !gfAllowFullscreenToggle)
+                return VERR_NOT_SUPPORTED;
+
+            /*
+             * We have to pause/resume the machine during this
+             * process because there might be a short moment
+             * without a valid framebuffer
+             */
+            MachineState_T machineState;
+            gMachine->COMGETTER(State)(&machineState);
+            if (machineState == MachineState_Running)
+                gConsole->Pause();
+            gpFrameBuffer->setFullscreen(!gpFrameBuffer->getFullscreen());
+            if (machineState == MachineState_Running)
+                gConsole->Resume();
+
+            /*
+             * We have switched from/to fullscreen, so request a full
+             * screen repaint, just to be sure.
+             */
+            gDisplay->InvalidateAndUpdate();
             break;
         }
@@ -4516 +4541 @@
         case SDLK_p:
         {
+            if (strchr(gHostKeyDisabledCombinations, 'p'))
+                return VERR_NOT_SUPPORTED;
+
             MachineState_T machineState;
             gMachine->COMGETTER(State)(&machineState);
@@ -4537 +4565 @@
         case SDLK_r:
         {
+            if (strchr(gHostKeyDisabledCombinations, 'r'))
+                return VERR_NOT_SUPPORTED;
+
             ResetVM();
             break;
@@ -4546 +4577 @@
         case SDLK_q:
         {
+            if (strchr(gHostKeyDisabledCombinations, 'q'))
+                return VERR_NOT_SUPPORTED;
+
             return VINF_EM_TERMINATE;
-            break;
         }
 
@@ -4555 +4588 @@
         case SDLK_s:
         {
+            if (strchr(gHostKeyDisabledCombinations, 's'))
+                return VERR_NOT_SUPPORTED;
+
             SaveState();
             return VINF_EM_TERMINATE;
@@ -4561 +4597 @@
         case SDLK_h:
         {
+            if (strchr(gHostKeyDisabledCombinations, 'h'))
+                return VERR_NOT_SUPPORTED;
+
             if (gConsole)
                 gConsole->PowerButton();
@@ -4571 +4610 @@
         case SDLK_n:
         {
+            if (strchr(gHostKeyDisabledCombinations, 'n'))
+                return VERR_NOT_SUPPORTED;
+
             RTThreadYield();
             ULONG cSnapshots = 0;