Changeset 3761 in vbox for trunk/src/VBox/Frontends/VBoxFB

Timestamp:

Jul 22, 2007 10:43:14 AM (18 years ago)

Author:

vboxsync

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

23084

Message:

Main/Frontends: Cleaned up IFramebuffer interface.

Location:

trunk/src/VBox/Frontends/VBoxFB

Files:

• Framebuffer.cpp (modified) (6 diffs)
• Framebuffer.h (modified) (1 diff)

trunk/src/VBox/Frontends/VBoxFB/Framebuffer.cpp

@@ -42 +42 @@
     }
     fbSurfaceLocked = 0;
-    uint32_t colorDepth;
-    GetColorDepth(&colorDepth);
-    fbPitch = fbWidth * (colorDepth / 8);
+    uint32_t bitsPerPixel;
+    GetBitsPerPixel(&bitsPerPixel);
+    fbPitch = fbWidth * (bitsPerPixel / 8);
 }
 
@@ -138 +138 @@
 }
 
-NS_IMETHODIMP VBoxDirectFB::GetColorDepth(uint32_t *colorDepth)
-{
-    if (!colorDepth)
+NS_IMETHODIMP VBoxDirectFB::GetBitsPerPixel(uint32_t *bitsPerPixel)
+{
+    if (!bitsPerPixel)
         return NS_ERROR_INVALID_POINTER;
     DFBSurfacePixelFormat pixelFormat;
@@ -147 +147 @@
     {
         case DSPF_RGB16:
-            *colorDepth = 16;
+            *bitsPerPixel = 16;
             break;
         case DSPF_RGB24:
-            *colorDepth = 24;
+            *bitsPerPixel = 24;
             break;
         case DSPF_RGB32:
-            *colorDepth = 32;
+            *bitsPerPixel = 32;
             break;
         default:
             // not good! @@@AH do something!
-            *colorDepth = 16;
-    }
-    return NS_OK;
-}
-
-NS_IMETHODIMP VBoxDirectFB::GetLineSize(uint32_t *lineSize)
-{
-    if (!lineSize)
-        return NS_ERROR_INVALID_POINTER;
-    *lineSize = fbPitch;
-    return NS_OK;
-}
-
-NS_IMETHODIMP VBoxDirectFB::COMGETTER(PixelFormat) (FramebufferPixelFormat_T *pixelFormat)
-{
-    if (!lineSize)
-        return NS_ERROR_INVALID_POINTER;
-    *pixelFormat = FramebufferPixelFormat_PixelFormatOpaque;
+            *bitsPerPixel = 16;
+    }
+    return NS_OK;
+}
+
+NS_IMETHODIMP VBoxDirectFB::GetBytesPerLine(uint32_t *bytesPerLine)
+{
+    if (!bytesPerLine)
+        return NS_ERROR_INVALID_POINTER;
+    *bytesPerLine = fbPitch;
+    return NS_OK;
+}
+
+NS_IMETHODIMP VBoxDirectFB::COMGETTER(PixelFormat) (ULONG *pixelFormat)
+{
+    if (!pixelFormat)
+        return NS_ERROR_INVALID_POINTER;
+    *pixelFormat = FramebufferPixelFormat_FOURCC_RGB;
+    return NS_OK;
+}
+
+NS_IMETHODIMP VBoxDirectFB::COMGETTER(UsesGuestVRAM) (BOOL *usesGuestVRAM)
+{
+    if (!usesGuestVRAM)
+        return NS_ERROR_INVALID_POINTER;
+    *usesGuestVRAM = FALSE;
     return NS_OK;
 }
@@ -213 +221 @@
 }
 
-NS_IMETHODIMP VBoxDirectFB::RequestResize(ULONG aScreenId, FramebufferPixelFormat_T pixelFormat, uint32_t vram, uint32_t lineSize, uint32_t w, uint32_t h,
-                                           PRBool *finished)
+NS_IMETHODIMP VBoxDirectFB::RequestResize(ULONG aScreenId, ULONG pixelFormat, uint32_t vram,
+                                          uint32_t bitsPerPixel, uint32_t bytesPerLine,
+                                          uint32_t w, uint32_t h,
+                                          PRBool *finished)
 {
     uint32_t needsLocking = fbSurfaceLocked;
-    uint32_t colorDepth;
-
-    GetColorDepth(&colorDepth);
+    uint32_t bitsPerPixel;
+
+    GetBitsPerPixel(&bitsPerPixel);
     printf("RequestResize: w = %d, h = %d, fbSurfaceLocked = %d\n", w, h, fbSurfaceLocked);
 
@@ -250 +260 @@
     {
         // we adopt to the guest resolution or the next higher that is available
-        int32_t bestMode = getBestVideoMode(w, h, colorDepth);
+        int32_t bestMode = getBestVideoMode(w, h, bitsPerPixel);
         if (bestMode == -1)
         {
@@ -260 +270 @@
         // does the mode differ from what we wanted?
         if ((videoModes[bestMode].width != w) || (videoModes[bestMode].height != h) ||
-            (videoModes[bestMode].bpp != colorDepth))
+            (videoModes[bestMode].bpp != bitsPerPixel))
         {
             printf("The mode does not fit exactly!\n");

trunk/src/VBox/Frontends/VBoxFB/Framebuffer.h

@@ -39 +39 @@
     NS_IMETHOD Unlock();
     NS_IMETHOD GetAddress(uint32_t *address);
-    NS_IMETHOD GetColorDepth(uint32_t *colorDepth);
-    NS_IMETHOD GetLineSize(uint32_t *lineSize);
-    NS_IMETHOD GetPixelFormat(FramebufferPixelFormat_T *pixelFormat);
+    NS_IMETHOD GetBitsPerPixel(uint32_t *bitsPerPixel);
+    NS_IMETHOD GetBytesPerLine(uint32_t *bytesPerLine);
+    NS_IMETHOD GetPixelFormat(ULONG *pixelFormat);
+    NS_IMETHOD GetUsesGuestVRAM(BOOL *usesGuestVRAM);
     NS_IMETHOD NotifyUpdate(uint32_t x, uint32_t y,
                            uint32_t w, uint32_t h, PRBool *finished);
-    NS_IMETHOD RequestResize(ULONG aScreenId, FramebufferPixelFormat_T pixelFormat, uint32_t vram, uint32_t lineSize, uint32_t w, uint32_t h,
+    NS_IMETHOD RequestResize(ULONG aScreenId, ULONG pixelFormat, uint32_t vram,
+                             uint32_t bitsPerPixel, uint32_t bytesPerLine,
+                             uint32_t w, uint32_t h,
                              PRBool *finished);
 private: