Ticket #1999: bootsplash.diff

src/system/kernel/boot_splash.cpp

@@ -189 +189 @@
     if (sInfo == NULL || stage < 0 || stage >= BOOT_SPLASH_STAGE_MAX)
         return;
 
-    // TODO: Use placement info from images.h
-    int x = sInfo->width / 2 - kSplashIconsWidth / 2;
-    int y = sInfo->height / 2 - kSplashLogoHeight / 2;
-    y = y + kSplashLogoHeight;
+    int maxWidth = kSplashLogoWidth;
+    if (maxWidth < kSplashIconsWidth) {
+        maxWidth = kSplashIconsWidth;
+    }
 
+    int x = sInfo->width * kSplashHorizontalPos / 100 - maxWidth / 2;
+    int y = sInfo->height * kSplashVerticalPos / 100 - kSplashIconsHeight / 2;
+
+    /* make sure the logo and icons are all within the framebuffer */
+
+    if (x < 0) {
+        x = 0;
+    }
+
+    x = x + ( maxWidth - kSplashIconsWidth ) / 2;
+
+    if (x + maxWidth > sInfo->width) {
+        x = (sInfo->width - maxWidth) + (maxWidth - kSplashIconsWidth) / 2;
+    }
+
+    if (y < kSplashLogoHeight) {
+        y = kSplashLogoHeight;
+    } else if (y + kSplashIconsHeight > sInfo->height) {
+        y = sInfo->height - kSplashIconsHeight ;
+    }
+
+
+
+
     int stageLeftEdge = kSplashIconsWidth * stage / BOOT_SPLASH_STAGE_MAX;
     int stageRightEdge = kSplashIconsWidth * (stage + 1)
         / BOOT_SPLASH_STAGE_MAX;

src/system/boot/platform/bios_ia32/video.cpp

@@ -861 +861 @@
     // TODO: support compressed RGB image data
 
     // render splash logo
-    int x = gKernelArgs.frame_buffer.width / 2 - kSplashLogoWidth / 2;
-    int y = gKernelArgs.frame_buffer.height / 2 - kSplashLogoHeight / 2;
+    int x = gKernelArgs.frame_buffer.width  * kSplashHorizontalPos / 100 - kSplashLogoWidth / 2;
+    int y = gKernelArgs.frame_buffer.height * kSplashVerticalPos / 100 -   kSplashIconsHeight / 2 - kSplashLogoHeight;
+
+    int maxWidth = kSplashLogoWidth;
+    if (maxWidth < kSplashIconsWidth) {
+        maxWidth = kSplashIconsWidth;
+    }
+
+    if (x < maxWidth - kSplashLogoWidth) {
+        x = maxWidth - kSplashLogoWidth;
+    }
+
+    if (y < 0) {
+        y = 0;
+    }
+
+    // in case some theme features larger icons than logo..
+    x = x + ( maxWidth - kSplashLogoWidth ) / 2;
+
+    if (x + maxWidth >= gKernelArgs.frame_buffer.width) {
+        x = (gKernelArgs.frame_buffer.width - maxWidth) + (maxWidth - kSplashLogoWidth) / 2;
+    }
+
+    if (y + kSplashLogoHeight + kSplashIconsHeight >= gKernelArgs.frame_buffer.height) {
+        y = gKernelArgs.frame_buffer.height - kSplashLogoHeight - kSplashIconsHeight;
+    }
+
     blit_image(kSplashLogoImage, NULL, kSplashLogoWidth, kSplashLogoHeight,
         NULL, x, y);
 
     // render initial (grayed out) icons
-    x = gKernelArgs.frame_buffer.width / 2 - kSplashIconsWidth / 2;
+    x = x + (maxWidth - kSplashIconsWidth) / 2;
     y = y + kSplashLogoHeight;
     uint16 iconsHalfHeight = kSplashIconsHeight / 2;
     const uint8* lowerHalfIconImage = kSplashIconsImage

headers/private/kernel/boot/images.h

@@ -1 +1 @@
 // This file was generated by the generate_boot_screen build tool.
 
+static const int16 kSplashVerticalPos = 50;
+static const int16 kSplashHorizontalPos = 50;
+
 static const uint16 kSplashLogoWidth = 397;
 static const uint16 kSplashLogoHeight = 90;
 static const uint8 kSplashLogoImage[] = {
@@ -21346 +21349 @@
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
 };
-