From 7baf8e0659a2ec254274bbc98d056ba39e993f1b Mon Sep 17 00:00:00 2001 From: kamikawa Date: Thu, 6 Mar 2008 07:18:38 +0000 Subject: [PATCH] =?UTF-8?q?1.=20TAD=E3=83=95=E3=82=A1=E3=82=A4=E3=83=AB?= =?UTF-8?q?=E3=81=AE=E5=88=A4=E5=AE=9A=E5=87=A6=E7=90=86=E3=81=AF=E3=81=93?= =?UTF-8?q?=E3=82=8C=E3=81=BE=E3=81=A7".tad"=E3=81=A8=E3=81=84=E3=81=86?= =?UTF-8?q?=E5=B0=8F=E6=96=87=E5=AD=97=E3=81=AE=E6=8B=A1=E5=BC=B5=E5=AD=90?= =?UTF-8?q?=E3=81=AE=E3=81=BF=E3=81=A7=E8=A1=8C=E3=81=A3=E3=81=A6=E3=81=84?= =?UTF-8?q?=E3=81=BE=E3=81=97=E3=81=9F=E3=81=8C=E3=80=81=E5=A4=A7=E6=96=87?= =?UTF-8?q?=E5=AD=97=E3=81=AE".TAD"=E3=82=82=E3=83=81=E3=82=A7=E3=83=83?= =?UTF-8?q?=E3=82=AF=E3=81=99=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3=E3=81=97=E3=81=BE=E3=81=97=E3=81=9F=E3=80=82=202.=20?= =?UTF-8?q?=E6=89=B1=E3=81=86=E3=81=93=E3=81=A8=E3=81=AE=E3=81=A7=E3=81=8D?= =?UTF-8?q?=E3=82=8BTAD=E3=83=95=E3=82=A1=E3=82=A4=E3=83=AB=E3=81=AE?= =?UTF-8?q?=E6=95=B0=E3=82=92=2016=20=E5=80=8B=E3=81=8B=E3=82=89=20256?= =?UTF-8?q?=E3=80=80=E5=80=8B=20=E3=81=AB=E5=A2=97=E3=82=84=E3=81=97?= =?UTF-8?q?=E3=81=BE=E3=81=97=E3=81=9F=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: file:///Users/lillianskinner/Downloads/platinum/twl/TwlIPL/trunk@836 b08762b0-b915-fc4b-9d8c-17b2551a87ff --- .../ARM9.TWL/src/process_import.c | 102 +++++++++++++----- 1 file changed, 75 insertions(+), 27 deletions(-) diff --git a/build/systemMenu_RED/NandInitializer/ARM9.TWL/src/process_import.c b/build/systemMenu_RED/NandInitializer/ARM9.TWL/src/process_import.c index 60724a0b..2f106cc1 100644 --- a/build/systemMenu_RED/NandInitializer/ARM9.TWL/src/process_import.c +++ b/build/systemMenu_RED/NandInitializer/ARM9.TWL/src/process_import.c @@ -61,7 +61,9 @@ typedef enum { // 表示＆インポートできる.TADファイルは最大16個まで // しかもＳＤカードのルートに存在するファイルのみというお手軽実装 -#define FILE_NUM_MAX 16 +#define FILE_NUM_MAX 256 + +#define VIEW_LINES_MAX 16 /*---------------------------------------------------------------------------* 内部変数定義 @@ -82,6 +84,10 @@ static u32 sCurrentProgress; static vu8 sNowImport = FALSE; +static s32 sTadListViewOffset; + +static s32 sLines; + /*---------------------------------------------------------------------------* 内部関数宣言 *---------------------------------------------------------------------------*/ @@ -89,6 +95,7 @@ static vu8 sNowImport = FALSE; static BOOL ImportTad(char* file_name, TadWriteOption option); static void ProgressThread(void* arg); static void Destructor(void* arg); +static void ShowTadList(void); static void DumpTadInfo(void); static void MakeFullPathForSD(char* file_name, char* full_path); static void ShowTitleinfoDifference( NAMTitleInfo* titleInfoNand, NAMTitleInfo* titleInfoSd); @@ -165,6 +172,9 @@ void* ImportProcess0(void) // ファイル数初期化 sFileNum = 0; + // 表示オフセット初期化 + sTadListViewOffset = 0; + // 背景全クリア for (i=0;i<24;i++) { @@ -205,7 +215,7 @@ void* ImportProcess0(void) pExtension = STD_SearchCharReverse( info->longname, '.'); if (pExtension) { - if (!STD_CompareString( pExtension, ".tad") ) + if (!STD_CompareString( pExtension, ".tad") || !STD_CompareString( pExtension, ".TAD") ) { char full_path[FS_ENTRY_LONGNAME_MAX+6]; @@ -215,7 +225,6 @@ void* ImportProcess0(void) STD_CopyString( sFilePath[sFileNum], info->longname ); kamiFontPrintfConsole(CONSOLE_ORANGE, "%d:%s\n", sFileNum, info->longname); - // 最大16個で終了 if (++sFileNum >= FILE_NUM_MAX) { break; @@ -470,11 +479,8 @@ static void* ImportAllNonexistentProcess0(void) Returns: next sequence *---------------------------------------------------------------------------*/ - static void* ImportIndividuallyProcess0(void) { - int i; - // 文字列全クリア kamiFontClear(); @@ -482,23 +488,8 @@ static void* ImportIndividuallyProcess0(void) kamiFontPrintf(2, 1, FONT_COLOR_BLACK, "Import from SD Card "); kamiFontPrintf(0, 2, FONT_COLOR_BLACK, "--------------------------------"); - // メニュー一覧 - kamiFontPrintf(3, 4, FONT_COLOR_BLACK, "+--------------------+----+"); - for (i=0;i VIEW_LINES_MAX) + { + sTadListViewOffset = sFileNum - VIEW_LINES_MAX; + } + else + { + sTadListViewOffset = 0; + } + } + if (sMenuSelectNoIndividually < sTadListViewOffset) + { + sTadListViewOffset--; + } + DumpTadInfo(); + ShowTadList(); } else if ( kamiPadIsRepeatTrigger(PAD_KEY_DOWN) ) { - if (++sMenuSelectNoIndividually > sFileNum) sMenuSelectNoIndividually = 0; + if (++sMenuSelectNoIndividually > sFileNum - 1) + { + sMenuSelectNoIndividually = 0; + sTadListViewOffset = 0; + } + if ((sMenuSelectNoIndividually - sTadListViewOffset) > VIEW_LINES_MAX - 1) + { + sTadListViewOffset++; + } + DumpTadInfo(); + ShowTadList(); } // カーソル配置 - SetCursorPos((u16)CURSOR_ORIGIN_X, (u16)(CURSOR_ORIGIN_Y + sMenuSelectNoIndividually * DOT_OF_MENU_SPACE_INDIVIDUALLY)); + SetCursorPos((u16)CURSOR_ORIGIN_X, (u16)(CURSOR_ORIGIN_Y + (sMenuSelectNoIndividually - sTadListViewOffset) * DOT_OF_MENU_SPACE_INDIVIDUALLY)); // 決定 if (kamiPadIsTrigger(PAD_BUTTON_A)) @@ -737,6 +754,37 @@ static void ProgressThread(void* /*arg*/) sNowImport = FALSE; } +/*---------------------------------------------------------------------------* + Name: ShowTadList + + Description: .tad のリストを表示する + + Arguments: arg - 使用しない。 + + Returns: None. + *---------------------------------------------------------------------------*/ +static void ShowTadList(void) +{ + int i; + + // メニュー一覧 + kamiFontPrintf(3, 4, FONT_COLOR_BLACK, "+--------------------+----+"); + if (sFileNum > 15) { sLines = VIEW_LINES_MAX; } + else { sLines = sFileNum; } + for (i=0;i