RaySollium99/picodrive
1
0
Fork 0
mirror of https://github.com/RaySollium99/picodrive.git synced 2025-09-04 23:07:46 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

cosmetic fixes for pandora port

Browse source
This commit is contained in:
notaz 2023-12-02 23:52:55 +02:00 • committed by irixxxx
parent 830935963d
commit 8a40739892
2 changed files with 13 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

11
platform/pandora/menu.c
View file

@ -24,11 +24,12 @@ static int menu_loop_cscaler(int id, int keys)
inp = in_menu_wait(PBTN_UP|PBTN_DOWN|PBTN_LEFT|PBTN_RIGHT
|PBTN_R|PBTN_MOK|PBTN_MBACK, NULL, 40);
if (inp & PBTN_UP) g_layer_cy--;
if (inp & PBTN_DOWN) g_layer_cy++;
if (inp & PBTN_LEFT) g_layer_cx--;
if (inp & PBTN_RIGHT) g_layer_cx++;
if (!(inp & PBTN_R)) {
if (inp & PBTN_R) {
if (inp & PBTN_UP) g_layer_cy--;
if (inp & PBTN_DOWN) g_layer_cy++;
if (inp & PBTN_LEFT) g_layer_cx--;
if (inp & PBTN_RIGHT) g_layer_cx++;
} else {
if (inp & PBTN_UP) g_layer_ch += 2;
if (inp & PBTN_DOWN) g_layer_ch -= 2;
if (inp & PBTN_LEFT) g_layer_cw += 2;

13
platform/pandora/plat.c
View file

@ -37,10 +37,10 @@
static struct vout_fbdev *main_fb, *layer_fb;
// g_layer_* - in use, g_layer_c* - configured custom
int g_layer_cx, g_layer_cy, g_layer_cw, g_layer_ch;
int g_layer_cx = 80, g_layer_cy, g_layer_cw = 640, g_layer_ch = 480;
static int g_layer_x, g_layer_y;
static int g_layer_w = 320, g_layer_h = 240;
static int g_osd_fps_x, g_osd_y, doing_bg_frame;
static int g_osd_start_x, g_osd_fps_x, g_osd_y, doing_bg_frame;
static unsigned char __attribute__((aligned(4))) fb_copy[320 * 240 * 2];
static void *temp_frame;
@ -48,7 +48,6 @@ const char *renderer_names[] = { NULL };
const char *renderer_names32x[] = { NULL };
static const char * const pandora_gpio_keys[KEY_MAX + 1] = {
[0 ... KEY_MAX] = NULL,
[KEY_UP] = "Up",
[KEY_LEFT] = "Left",
[KEY_RIGHT] = "Right",
@ -165,7 +164,7 @@ static void draw_cd_leds(void)
void pemu_finalize_frame(const char *fps, const char *notice)
{
if (notice && notice[0])
emu_osd_text16(2, g_osd_y, notice);
emu_osd_text16(2 + g_osd_start_x, g_osd_y, notice);
if (fps && fps[0] && (currentConfig.EmuOpt & EOPT_SHOW_FPS))
emu_osd_text16(g_osd_fps_x, g_osd_y, fps);
if ((PicoIn.AHW & PAHW_MCD) && (currentConfig.EmuOpt & EOPT_EN_CD_LEDS))
@ -340,7 +339,7 @@ void emu_video_mode_change(int start_line, int line_count, int start_col, int co
fb_w = col_count;
fb_left = start_col;
fb_right = 320 - (fb_w+fb_left);;
fb_right = 320 - (fb_w + fb_left);
switch (currentConfig.scaling) {
case SCALE_1x1:
@ -380,7 +379,8 @@ void emu_video_mode_change(int start_line, int line_count, int start_col, int co
fb_h = line_count;
break;
}
g_osd_fps_x = col_count < 320 ? 232 : 264;
g_osd_start_x = start_col;
g_osd_fps_x = start_col + col_count - 5*8 - 2;
g_osd_y = fb_top + fb_h - 8;
pnd_setup_layer(1, g_layer_x, g_layer_y, g_layer_w, g_layer_h);
@ -411,6 +411,7 @@ void pemu_loop_prep(void)
void pemu_loop_end(void)
{
memset(fb_copy, 0, sizeof(fb_copy));
/* do one more frame for menu bg */
pemu_forced_frame(0, 1);