git-svn-id: file:///Users/lillianskinner/Downloads/platinum/twl/TwlIPL/trunk@1941 b08762b0-b915-fc4b-9d8c-17b2551a87ff

This commit is contained in:
aoki_ryoma 2008-07-18 04:23:56 +00:00
parent f881163b2d
commit 7ad2ba2810
4 changed files with 52 additions and 12 deletions

View File

@ -85,6 +85,7 @@ void printBinary16( int x, int y, u16 value, int selected, int selectSize );
void printBinary32( int x, int y, u32 value, int selected, int selectSize );
void drawRegister( int menu, int selected );
void drawChangeMode( DispInfoEntry *Entry, int changeLine );
void drawVersion( int startIdx, int selected );
void printUniqueID( int drawLineOffset, char *uniqueId );
int getPageNum( int valueIdx, const int* pageOffset );
int countMenuLine( int menu );
@ -420,6 +421,36 @@ void drawChangeMode( DispInfoEntry *entry, int changeLine )
}
void drawVersion( int startIdx, int selected )
{
int drawLine = 0;
int kindColor = TXT_COLOR_BLACK;
/*
for( drawLine = 0;
if( idx < 2 )
{
printKindName( MENU_VERSION, idx, drawLine, selected );
printValue( MENU_VERSION, idx, drawLine, &gAllInfo[MENU_VERSION][idx] );
return;
}
if( idx == selected)
{
// 選択項目はいろかえる
kindColor = TXT_COLOR_GREEN;
PutStringUTF16( ALLOW_LEFT, KIND_UP + LINE_OFFSET*drawLine, TXT_COLOR_BLACK, (const u16 *)L"");
}
// 項目名
PrintfSJIS( KIND_LEFT, KIND_UP + LINE_OFFSET*drawLine , kindColor, "%d", gContentsTitle[idx - 2] );
// 値
PrintfSJIS( VALUE_LEFT, VALUE_UP + LINE_OFFSET*drawLine , TXT_COLOR_BLACK, "%u",gContentsVersion[idx - 2] );
*/
}
void drawMenu( int menu, int line, int changeLine, BOOL isChangeMode )
// 情報一覧を描画する
@ -459,16 +490,24 @@ void drawMenu( int menu, int line, int changeLine, BOOL isChangeMode )
calibrateDrawIdx( menu, line );
}
// 項目数可変なVersion infoだけ別枠で描画する
if( menu == MENU_VERSION )
{
drawVersion( gDrawIdx[menu], line );
}
for( i = gDrawIdx[menu] ; i < s_numMenu[menu] && lineNum < DISP_NUM_LINES ; i++ )
{
// 項目名の描画
printKindName( menu, i, lineNum, line );
// 値の描画
if( menu == MENU_SCFG_ARM7 && !gSelectedARM7SCFGReg )
{
// ARM7のSCFGで共有領域側の値を表示してるときはオフセットを加える
printValue( menu, i, lineNum, &gAllInfo[menu][i + SCFG_ARM7_SHARED_OFFSET] );
}
else
@ -479,15 +518,15 @@ void drawMenu( int menu, int line, int changeLine, BOOL isChangeMode )
// 描画オフセットの更新
lineNum += gAllInfo[menu][i].numLines;
}
/*
// スクロールバーとか出す?
// 全体の行数を把握
if( gMenuLineSize[menu] == 0 )
{
gMenuLineSize[menu] = countMenuLine(menu);
}
// スクロールバーとか出す?
*/
}
int countLinesDown( int menu, int idx )

View File

@ -28,7 +28,8 @@ const int s_pageOffset[ROOTMENU_SIZE][MAXPAGE] = {
{ 0, VERSIONMENU_SIZE } // fuse
};
const u8 s_numMenu[] = {
// VERSION_MENU_SIZEだけコンテンツ数に応じて可変なのでconstではない
int s_numMenu[] = {
OWNERMENU_SIZE,
PARENTALMENU_SIZE,
NORMAL_HW_MENU_SIZE,

View File

@ -160,7 +160,7 @@
#define VERSIONMENU_SIZE 3
extern const u8 s_numMenu[];
extern int s_numMenu[];
extern const char *s_strRootMenu[];
extern const char *s_strOwnerMenu[];
extern const char *s_strParentalMenu[];

View File

@ -517,7 +517,7 @@ void getSCFGARM9Info( void )
gAllInfo[MENU_SCFG_ARM9][SCFG_ARM9_EXT_MCB].iValue = value;
gAllInfo[MENU_SCFG_ARM9][SCFG_ARM9_EXT_MCB].str.sjis = s_strAccess[ value ];
value = SCFG_IsWramAccessible();
value = SCFG_IsWRAMAccessible();
gAllInfo[MENU_SCFG_ARM9][SCFG_ARM9_EXT_WRAM].iValue = value;
gAllInfo[MENU_SCFG_ARM9][SCFG_ARM9_EXT_WRAM].str.sjis = s_strAccess[ value ];
@ -550,7 +550,7 @@ void getSCFGARM9Info( void )
{
u8 idx;
value = SCFG_GetPsramBoundary();
value = SCFG_GetPsramdBoundary();
if( value == SCFG_PSRAM_BOUNDARY_4MB )
{
@ -591,11 +591,11 @@ void getSCFGARM9Info( void )
gAllInfo[MENU_SCFG_ARM9][SCFG_ARM9_EXT_LCDC].kindNameList = s_strEnable;
gAllInfo[MENU_SCFG_ARM9][SCFG_ARM9_EXT_LCDC].numKindName = 2;
value = SCFG_IsVramExpanded();
value = SCFG_IsVRAMExpanded();
gAllInfo[MENU_SCFG_ARM9][SCFG_ARM9_EXT_VRAM].iValue = value;
gAllInfo[MENU_SCFG_ARM9][SCFG_ARM9_EXT_VRAM].str.sjis = s_strEnable[ value ];
gAllInfo[MENU_SCFG_ARM9][SCFG_ARM9_EXT_VRAM].changable = TRUE;
gAllInfo[MENU_SCFG_ARM9][SCFG_ARM9_EXT_VRAM].changeFunc.cBool = SCFG_SetVramExpanded;
gAllInfo[MENU_SCFG_ARM9][SCFG_ARM9_EXT_VRAM].changeFunc.cBool = SCFG_SetVRAMExpanded;
gAllInfo[MENU_SCFG_ARM9][SCFG_ARM9_EXT_VRAM].argType = ARG_BOOL;
gAllInfo[MENU_SCFG_ARM9][SCFG_ARM9_EXT_VRAM].kindNameList = s_strEnable;
gAllInfo[MENU_SCFG_ARM9][SCFG_ARM9_EXT_VRAM].numKindName = 2;
@ -1180,7 +1180,7 @@ void getContentsVersion( void )
gContentsTitle[i] = info.titleId;
gContentsVersion[i] = info.version;
}
}