eaw/Main
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Menu core: improved OSD timeout, hide logo as well, darked the screen after double timeout.

Browse Source
This commit is contained in:
sorgelig
2019-06-04 15:49:06 +08:00
parent 6965cf08a7
commit d78a41aa31
7 changed files with 93 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

99
video.cpp
View File

@@ -28,10 +28,10 @@
#define FB_ADDR (0x20000000 + (32*1024*1024)) // 512mb + 32mb(Core's fb)
/*
-- [2:0] : 011=8bpp(palette) 100=16bpp 101=24bpp 110=32bpp
-- [3] : 0=16bits 565 1=16bits 1555
-- [4] : 0=RGB 1=BGR (for 16/24/32 modes)
-- [5] : TBD
-- [2:0] : 011=8bpp(palette) 100=16bpp 101=24bpp 110=32bpp
-- [3] : 0=16bits 565 1=16bits 1555
-- [4] : 0=RGB 1=BGR (for 16/24/32 modes)
-- [5] : TBD
*/
#define FB_FMT_565 0b00100
@@ -857,7 +857,7 @@ static void vs_wait()
static int bg_has_picture = 0;
extern uint8_t _binary_logo_png_start[], _binary_logo_png_end[];
void video_menu_bg(int n)
void video_menu_bg(int n, int idle)
{
bg_has_picture = 0;
menu_bg = n;
@@ -909,6 +909,21 @@ void video_menu_bg(int n)
Imlib_Image *bg = (menu_bgn == 1) ? &bg1 : &bg2;
//printf("*bg = %p\n", *bg);
static Imlib_Image curtain = 0;
if (!curtain)
{
curtain = imlib_create_image(fb_width, fb_height);
imlib_context_set_image(curtain);
imlib_image_set_has_alpha(1);
uint32_t *data = imlib_image_get_data();
int sz = fb_width * fb_height;
for (int i = 0; i < sz; i++)
{
*data++ = 0x9F000000;
}
}
switch (n)
{
case 1:
@@ -949,7 +964,7 @@ void video_menu_bg(int n)
if (*bg)
{
imlib_context_set_image(*bg);
imlib_blend_image_onto_image(menubg, 255,
imlib_blend_image_onto_image(menubg, 0,
0, 0, //int source_x, int source_y,
src_w, src_h, //int source_width, int source_height,
0, 0, //int destination_x, int destination_y,
@@ -990,7 +1005,7 @@ void video_menu_bg(int n)
break;
}
if (logo)
if (logo && !idle)
{
imlib_context_set_image(logo);
@@ -1001,7 +1016,7 @@ void video_menu_bg(int n)
if (*bg)
{
imlib_context_set_image(*bg);
imlib_blend_image_onto_image(logo, 255,
imlib_blend_image_onto_image(logo, 1,
0, 0, //int source_x, int source_y,
src_w, src_h, //int source_width, int source_height,
0, 0, //int destination_x, int destination_y,
@@ -1014,6 +1029,24 @@ void video_menu_bg(int n)
}
}
if (curtain && idle > 1)
{
if (*bg)
{
imlib_context_set_image(*bg);
imlib_blend_image_onto_image(curtain, 1,
0, 0, //int source_x, int source_y,
fb_width, fb_height, //int source_width, int source_height,
0, 0, //int destination_x, int destination_y,
fb_width, fb_height //int destination_width, int destination_height
);
}
}
else
{
printf("curtain = 0!\n");
}
//test the fb driver
vs_wait();
printf("**** BG DEBUG END ****\n");
@@ -1098,31 +1131,31 @@ void video_cmd(char *cmd)
if (accept)
{
switch (fmt)
{
case 8888:
bpp = 4;
sc_fmt = FB_FMT_8888;
break;
case 1555:
bpp = 2;
sc_fmt = FB_FMT_1555;
break;
case 565:
bpp = 2;
sc_fmt = FB_FMT_565;
break;
case 8:
bpp = 1;
sc_fmt = FB_FMT_PAL8;
rb = 0;
break;
default:
accept = 0;
switch (fmt)
{
case 8888:
bpp = 4;
sc_fmt = FB_FMT_8888;
break;
case 1555:
bpp = 2;
sc_fmt = FB_FMT_1555;
break;
case 565:
bpp = 2;
sc_fmt = FB_FMT_565;
break;
case 8:
bpp = 1;
sc_fmt = FB_FMT_PAL8;
rb = 0;
break;
default:
accept = 0;
}
}