Changeset 8154 in vbox for trunk/src

Timestamp:

Apr 18, 2008 3:00:53 PM (17 years ago)

Author:

vboxsync

Message:

FE/SDL: introduced -seclabelofs

Location:

trunk/src/VBox/Frontends/VBoxSDL

Files:

• Framebuffer.cpp (modified) (3 diffs)
• Framebuffer.h (modified) (2 diffs)
• VBoxSDL.cpp (modified) (4 diffs)

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

@@ -112 +112 @@
     mLabelFont      = NULL;
     mLabelHeight    = 0;
+    mLabelOffs      = 0;
 #endif
     mWMIcon         = NULL;
@@ -981 +982 @@
  * @param pointsize font size in points
  */
-int VBoxSDLFB::initSecureLabel(uint32_t height, char *font, uint32_t pointsize)
+int VBoxSDLFB::initSecureLabel(uint32_t height, char *font, uint32_t pointsize, uint32_t labeloffs)
 {
     LogFlow(("VBoxSDLFB:initSecureLabel: new offset: %d pixels, new font: %s, new pointsize: %d\n",
               height, font, pointsize));
     mLabelHeight = height;
+    mLabelOffs = labeloffs;
     Assert(font);
     pTTF_Init();
@@ -1062 +1064 @@
                                  : pTTF_RenderUTF8_Solid(mLabelFont, mSecureLabelText.raw(), clrFg);
         rect.x = 10;
+        rect.y = mLabelOffs;
         SDL_BlitSurface(sText, NULL, mScreen, &rect);
         SDL_FreeSurface(sText);

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

@@ -123 +123 @@
     uint32_t getGuestYRes() { return mGuestYRes; }
 #ifdef VBOX_SECURELABEL
-    int  initSecureLabel(uint32_t height, char *font, uint32_t pointsize);
+    int  initSecureLabel(uint32_t height, char *font, uint32_t pointsize, uint32_t labeloffs);
     void setSecureLabelText(const char *text);
     void setSecureLabelColor(uint32_t colorFG, uint32_t colorBG);
@@ -178 +178 @@
     /** secure label height in pixels */
     uint32_t mLabelHeight;
+    /** secure label offset from the top of the secure label */
+    uint32_t mLabelOffs;
 #endif
 #ifdef RT_OS_WINDOWS

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

@@ -659 +659 @@
              "  -seclabelfnt             TrueType (.ttf) font file for secure session label\n"
              "  -seclabelsiz             Font point size for secure session label (default 12)\n"
+             "  -seclabelofs             Font offset within the secure label (default 0)\n"
              "  -seclabelfgcol <rgb>     Secure label text color RGB value in 6 digit hexadecimal (eg: FFFF00)\n"
              "  -seclabelbgcol <rgb>     Secure label background color RGB value in 6 digit hexadecimal (eg: FF0000)\n"
@@ -1004 +1005 @@
     BOOL fSecureLabel = false;
     uint32_t secureLabelPointSize = 12;
+    uint32_t secureLabelFontOffs = 0;
     char *secureLabelFontFile = NULL;
     uint32_t secureLabelColorFG = 0x0000FF00;
@@ -1419 +1421 @@
             secureLabelPointSize = atoi(argv[curArg]);
         }
+        else if (strcmp(argv[curArg], "-seclabelofs") == 0)
+        {
+            if (++curArg >= argc)
+            {
+                RTPrintf("Error: missing font pixel offset for secure label!\n");
+                rc = E_FAIL;
+                break;
+            }
+            secureLabelFontOffs = atoi(argv[curArg]);
+        }
         else if (strcmp(argv[curArg], "-seclabelfgcol") == 0)
         {
@@ -1880 +1892 @@
             rcVBox = RTLdrGetSymbol(gLibrarySDL_ttf, "TTF_Quit", (void**)&pTTF_Quit);
         if (VBOX_SUCCESS(rcVBox))
-            rcVBox = gpFrameBuffer->initSecureLabel(SECURE_LABEL_HEIGHT, secureLabelFontFile, secureLabelPointSize);
+            rcVBox = gpFrameBuffer->initSecureLabel(SECURE_LABEL_HEIGHT, secureLabelFontFile, secureLabelPointSize, secureLabelFontOffs);
         if (VBOX_FAILURE(rcVBox))
         {