screen ptr/size unification, major cleanups

git-svn-id: file:///home/notaz/opt/svn/PicoDrive/platform@644 be3aeb3a-fb24-0410-a615-afba39da0efa
This commit is contained in:
notaz 2009-03-04 22:07:13 +00:00
parent bf3c44f485
commit e31266dd11
16 changed files with 259 additions and 415 deletions

View file

@ -1,155 +1,17 @@
// platform specific things for common menu code
/* TODO: get rid of this file */
#ifdef __GP2X__
#include "../gp2x/gp2x.h"
// TODO merge
#define PBTN_UP (1 << 0)
#define PBTN_DOWN (1 << 1)
#define PBTN_LEFT (1 << 2)
#define PBTN_RIGHT (1 << 3)
#define PBTN_NORTH (1 << 4)
#define PBTN_SOUTH (1 << 5)
#define PBTN_WEST (1 << 6)
#define PBTN_EAST (1 << 7)
#define PBTN_L (1 << 8)
#define PBTN_R (1 << 9)
/* menu nav */
#define PBTN_MOK PBTN_EAST
#define PBTN_MBACK PBTN_SOUTH
#define PBTN_MENU (1 << 10)
#if 0
#define PBTN_UP GP2X_UP
#define PBTN_DOWN GP2X_DOWN
#define PBTN_LEFT GP2X_LEFT
#define PBTN_RIGHT GP2X_RIGHT
#define PBTN_NORTH GP2X_Y
#define PBTN_SOUTH GP2X_X
#define PBTN_WEST GP2X_A
#define PBTN_EAST GP2X_B
#define PBTN_L GP2X_L
#define PBTN_R GP2X_R
/* menu nav */
#define PBTN_MOK GP2X_B
#define PBTN_MBACK GP2X_X
#define PBTN_MENU GP2X_SELECT
#endif
#define GP2X_Y 0 /* FIXME */
void gp2x_pd_clone_buffer2(void);
void menu_darken_bg(void *dst, int pixels, int darker);
void menu_flip(void);
#define SCREEN_WIDTH 320
#define SCREEN_HEIGHT 240
#define SCREEN_BUFFER gp2x_screen
#define menu_draw_begin() \
gp2x_pd_clone_buffer2()
#define clear_screen() \
memset(gp2x_screen, 0, 320*240*2)
#define darken_screen() \
menu_darken_bg(gp2x_screen, 320*240, 0)
#define menu_draw_end() \
menu_flip()
// ------------------------------------
#elif defined(__GIZ__)
#include "../gizmondo/giz.h"
#define PBTN_NORTH PBTN_STOP
#define PBTN_SOUTH PBTN_PLAY
#define PBTN_WEST PBTN_REW
#define PBTN_EAST PBTN_FWD
void menu_draw_begin(int use_bgbuff);
void menu_darken_bg(void *dst, const void *src, int pixels, int darker);
void menu_draw_end(void);
#define SCREEN_WIDTH 321
#define SCREEN_HEIGHT 240
#define SCREEN_BUFFER ((giz_screen != NULL) ? giz_screen : menu_screen)
extern void *menu_screen;
extern void *giz_screen;
#define menu_draw_begin() \
menu_draw_begin(1)
#define clear_screen() \
memset(SCREEN_BUFFER, 0, SCREEN_WIDTH*SCREEN_HEIGHT*2)
#define darken_screen() \
menu_darken_bg(menu_screen, menu_screen, SCREEN_WIDTH*SCREEN_HEIGHT, 0)
// ------------------------------------
#elif defined(PSP)
#include "../psp/psp.h"
#define PBTN_NORTH PBTN_TRIANGLE
#define PBTN_SOUTH PBTN_X
#define PBTN_WEST PBTN_SQUARE
#define PBTN_EAST PBTN_CIRCLE
void menu_draw_begin(void);
void menu_darken_bg(void *dst, const void *src, int pixels, int darker);
void menu_draw_end(void);
#define SCREEN_WIDTH 512
#define SCREEN_HEIGHT 272
#define SCREEN_BUFFER psp_screen
#define clear_screen() \
memset(SCREEN_BUFFER, 0, SCREEN_WIDTH*SCREEN_HEIGHT*2)
#define darken_screen() \
menu_darken_bg(psp_screen, psp_screen, SCREEN_WIDTH*SCREEN_HEIGHT, 0)
// ------------------------------------
#elif defined(PANDORA)
/* random common definitions */
#define PBTN_UP (1 << 0)
#define PBTN_DOWN (1 << 1)
#define PBTN_LEFT (1 << 2)
#define PBTN_RIGHT (1 << 3)
#define PBTN_NORTH (1 << 4)
#define PBTN_SOUTH (1 << 5)
#define PBTN_WEST (1 << 6)
#define PBTN_EAST (1 << 7)
#define PBTN_MOK (1 << 4)
#define PBTN_MBACK (1 << 5)
#define PBTN_MA2 (1 << 6) /* menu action 2 */
#define PBTN_MA3 (1 << 7)
#define PBTN_L (1 << 8)
#define PBTN_R (1 << 9)
/* menu nav */
#define PBTN_MOK PBTN_EAST
#define PBTN_MBACK PBTN_SOUTH
#define PBTN_MENU (1 << 10)
void gp2x_pd_clone_buffer2(void);
void menu_darken_bg(void *dst, int pixels, int darker);
void menu_flip(void);
extern void *gp2x_screen;
#define SCREEN_WIDTH 800
#define SCREEN_HEIGHT 480
#define SCREEN_BUFFER gp2x_screen
#define menu_draw_begin() \
gp2x_pd_clone_buffer2()
#define clear_screen() \
memset(gp2x_screen, 0, 800*480*2)
#define darken_screen() \
menu_darken_bg(gp2x_screen, 800*480, 0)
#define menu_draw_end() \
menu_flip()
#endif