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

Timestamp:

May 4, 2007 8:52:58 AM (18 years ago)

Author:

vboxsync

Message:

HostKey+H; cosmetical changes

Location:

trunk/src/VBox/Frontends/VBoxBFE

Files:

• ConsoleImpl.h (modified) (2 diffs)
• DisplayImpl.cpp (modified) (8 diffs)
• SDLConsole.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VBoxBFE/ConsoleImpl.h

@@ -119 +119 @@
     virtual void     mouseSendEvent(int dz) = 0;
     virtual void     onMousePointerShapeChange(bool fVisible,
-                                 bool fAlpha, uint32_t xHot,
-                                 uint32_t yHot, uint32_t width,
-                                 uint32_t height, void *pShape) = 0;
+                                               bool fAlpha, uint32_t xHot,
+                                               uint32_t yHot, uint32_t width,
+                                               uint32_t height, void *pShape) = 0;
 
     virtual CONEVENT eventWait() = 0;
@@ -134 +134 @@
 extern Console *gConsole;
 
-
 #endif // ____H_CONSOLEIMPL

trunk/src/VBox/Frontends/VBoxBFE/DisplayImpl.cpp

@@ -217 +217 @@
     {
         *px += *pw; /* Compute xRight which is also the new width. */
-
-        *pw = (*px < 0)? 0: *px;
-
+        *pw = (*px < 0) ? 0: *px;
         *px = 0;
     }
@@ -226 +224 @@
     {
         *py += *ph; /* Compute xBottom, which is also the new height. */
-
-        *ph = (*py < 0)? 0: *py;
-
+        *ph = (*py < 0) ? 0: *py;
         *py = 0;
     }
@@ -234 +230 @@
     /* Also check if coords are greater than the display resolution. */
     if (*px + *pw > cx)
-    {
-        *pw = cx > *px? cx - *px: 0;
-    }
+        *pw = cx > *px ? cx - *px: 0;
 
     if (*py + *ph > cy)
-    {
-        *ph = cy > *py? cy - *py: 0;
-    }
+        *ph = cy > *py ? cy - *py: 0;
 }
 
@@ -274 +266 @@
 
         mFramebuffer->NotifyUpdate(x, y, w, h, &finished);
+        mFramebuffer->Unlock();
+
         if (!finished)
         {
             // the Framebuffer needs more time to process
             // the event so we have to halt the VM until it's done
-            mFramebuffer->Unlock();
             RTSemEventMultiWait(mUpdateSem, RT_INDEFINITE_WAIT);
-        } else
-        {
-            mFramebuffer->Unlock();
-        }
-    }
-    return;
+        }
+    }
 }
 
@@ -646 +635 @@
         /* Adjust region coordinates. */
         if (prgn->xLeft > phdr->x)
-        {
             prgn->xLeft = phdr->x;
-        }
 
         if (prgn->yTop > phdr->y)
-        {
             prgn->yTop = phdr->y;
-        }
 
         if (prgn->xRight < xRight)
-        {
             prgn->xRight = xRight;
-        }
 
         if (prgn->yBottom < yBottom)
-        {
             prgn->yBottom = yBottom;
-        }
     }
 }
@@ -729 +710 @@
 
     if (!VideoAccelAllowed ())
-    {
         return VERR_NOT_SUPPORTED;
-    }
 
     /*
@@ -754 +733 @@
     /* Check that current status is not being changed */
     if (mfVideoAccelEnabled == fEnable)
-    {
         return rc;
-    }
 
     if (mfVideoAccelEnabled)
@@ -784 +761 @@
 
     if (pVMMDevPort)
-    {
         pVMMDevPort->pfnVBVAChange (pVMMDevPort, fEnable);
-    }
 
     if (fEnable)

trunk/src/VBox/Frontends/VBoxBFE/SDLConsole.cpp

@@ -1594 +1594 @@
         }
 
+        /*
+         * Send ACPI power button press event
+         */
+        case SDLK_h:
+        {
+            PPDMIBASE pBase;
+            int vrc = PDMR3QueryDeviceLun (pVM, "acpi", 0, 0, &pBase);
+            if (VBOX_SUCCESS (vrc))
+            {
+                Assert (pBase);
+                PPDMIACPIPORT pPort =
+                    (PPDMIACPIPORT) pBase->pfnQueryInterface(pBase, PDMINTERFACE_ACPI_PORT);
+                vrc = pPort ? pPort->pfnPowerButtonPress(pPort) : VERR_INVALID_POINTER;
+            }
+            break;
+        }
+
 #if 0
         /*