diff -Nur psplash.orig//Makefile.am psplash/Makefile.am --- psplash.orig//Makefile.am 2011-10-17 13:22:41.000000000 +0200 +++ psplash/Makefile.am 2011-10-19 15:43:27.000000000 +0200 @@ -4,7 +4,7 @@ psplash_SOURCES = psplash.c psplash.h psplash-fb.c psplash-fb.h \ psplash-console.c psplash-console.h \ - psplash-poky-img.h psplash-bar-img.h radeon-font.h + psplash-mld-img.h radeon-font.h psplash_write_SOURCES = psplash-write.c psplash.h diff -Nur psplash.orig//psplash.c psplash/psplash.c --- psplash.orig//psplash.c 2011-10-17 13:22:56.000000000 +0200 +++ psplash/psplash.c 2011-10-19 15:48:57.000000000 +0200 @@ -19,8 +19,7 @@ */ #include "psplash.h" -#include "psplash-poky-img.h" -#include "psplash-bar-img.h" +#include "psplash-mld-img.h" #include "radeon-font.h" #define MSG "" @@ -54,7 +53,7 @@ psplash_fb_draw_text (fb, (fb->width-w)/2, fb->height - (fb->height/6) - h, - 0x6d, 0x6d, 0x70, + 0x00, 0x00, 0x00, &radeon_font, msg); } @@ -64,30 +63,32 @@ { int x, y, width, height, barwidth; - /* 4 pix border */ - x = ((fb->width - BAR_IMG_WIDTH)/2) + 4 ; - y = fb->height - (fb->height/6) + 4; - width = BAR_IMG_WIDTH - 8; - height = BAR_IMG_HEIGHT - 8; + x = 208*fb->width/800; + y = 369*fb->height/600; + width = 386*fb->width/800; + height = 5*fb->height/600; + + // border + psplash_fb_draw_rect (fb, x-1, y-1, width+1, height+1, 0x31, 0x32, 0x34); if (value > 0) { barwidth = (CLAMP(value,0,100) * width) / 100; psplash_fb_draw_rect (fb, x + barwidth, y, width - barwidth, height, - 0xec, 0xec, 0xe1); + 0x10, 0x10, 0x10); psplash_fb_draw_rect (fb, x, y, barwidth, - height, 0x6d, 0x6d, 0x70); + height, 0x84, 0x83, 0x81); } else { barwidth = (CLAMP(-value,0,100) * width) / 100; psplash_fb_draw_rect (fb, x, y, width - barwidth, height, - 0xec, 0xec, 0xe1); + 0x10, 0x10, 0x10); psplash_fb_draw_rect (fb, x + width - barwidth, y, barwidth, height, - 0x6d, 0x6d, 0x70); + 0x84, 0x83, 0x81); } DBG("value: %i, width: %i, barwidth :%i\n", value, @@ -263,31 +264,21 @@ goto fb_fail; } - /* Clear the background with #ecece1 */ - psplash_fb_draw_rect (fb, 0, 0, fb->width, fb->height, 0xec, 0xec, 0xe1); + /* Clear the background */ + psplash_fb_draw_rect (fb, 0, 0, fb->width, fb->height, 0x00, 0x00, 0x00); - /* Draw the Poky logo */ + /* Draw the mld logo */ psplash_fb_draw_image (fb, - (fb->width - POKY_IMG_WIDTH)/2, - ((fb->height * 5) / 6 - POKY_IMG_HEIGHT)/2, - POKY_IMG_WIDTH, - POKY_IMG_HEIGHT, - POKY_IMG_BYTES_PER_PIXEL, - POKY_IMG_RLE_PIXEL_DATA); + (fb->width - MLD_IMG_WIDTH)/2, + (fb->height - MLD_IMG_HEIGHT)/2, + MLD_IMG_WIDTH, + MLD_IMG_HEIGHT, + MLD_IMG_BYTES_PER_PIXEL, + MLD_IMG_RLE_PIXEL_DATA); - /* Draw progress bar border */ - psplash_fb_draw_image (fb, - (fb->width - BAR_IMG_WIDTH)/2, - fb->height - (fb->height/6), - BAR_IMG_WIDTH, - BAR_IMG_HEIGHT, - BAR_IMG_BYTES_PER_PIXEL, - BAR_IMG_RLE_PIXEL_DATA); psplash_draw_progress (fb, 0); - psplash_draw_msg (fb, MSG); - psplash_main (fb, pipe_fd, 0);