From 32b2cf2945f2fdd4c9fdbd5067666f22b1a58f87 Mon Sep 17 00:00:00 2001
From: yoshida_teruhisa <yoshida_teruhisa@b08762b0-b915-fc4b-9d8c-17b2551a87ff>
Date: Mon, 19 Nov 2007 07:41:00 +0000
Subject: [PATCH] =?UTF-8?q?=E3=83=A9=E3=83=B3=E3=83=81=E3=83=A3=E3=83=BC?=
 =?UTF-8?q?=E3=80=80=E3=82=BF=E3=83=83=E3=83=81=E3=83=91=E3=83=83=E3=83=89?=
 =?UTF-8?q?=E3=81=AB=E3=82=88=E3=82=8B=E9=81=B8=E6=8A=9E=E3=81=A8=E6=B1=BA?=
 =?UTF-8?q?=E5=AE=9A=E3=82=92=E5=AE=9F=E8=A3=85?=
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@214 b08762b0-b915-fc4b-9d8c-17b2551a87ff
---
 .../Launcher/ARM9/src/launcher.c              | 32 ++++++++++++++++---
 .../MachineSettings/ARM9/src/MachineSetting.c |  2 +-
 .../MachineSettings/ARM9/src/setOwnerInfo.c   |  2 +-
 build/systemMenu_RED/data/BGData_Launcher.c   | 13 ++++----
 .../data/BGData_MachineSettings.c             |  2 +-
 5 files changed, 38 insertions(+), 13 deletions(-)

diff --git a/build/systemMenu_RED/Launcher/ARM9/src/launcher.c b/build/systemMenu_RED/Launcher/ARM9/src/launcher.c
index f3492415..4e8d687f 100644
--- a/build/systemMenu_RED/Launcher/ARM9/src/launcher.c
+++ b/build/systemMenu_RED/Launcher/ARM9/src/launcher.c
@@ -37,7 +37,7 @@
 
 // extern data------------------------------------------
 
-extern u32 bg_char_data[16 * 5];
+extern u32 bg_char_data[8 * 6];
 extern u16 bg_scr_data[32 * 32];
 extern u16 bg_scr_data2[32 * 32];
 
@@ -331,6 +331,23 @@ static BOOL SelectCenterFunc( u16 *csr, TPData *tgt )
 	return FALSE;
 }
 
+static BOOL SelectFunc( u16 *csr, TPData *tgt )
+{
+	int l;
+	
+	for(l=0; l<2; l++)
+	{
+		int x = 11*8 + l*6*8;
+		int y = 19*8;
+		if(WithinRangeTP( x, y, x+32, y+16, tgt ))
+		{
+			*csr = (u16)l;
+			return TRUE;
+		}
+	}
+	return FALSE;
+}
+
 // ランチャーメイン
 TitleProperty *LauncherMain( TitleProperty *pTitleList )
 {
@@ -344,6 +361,7 @@ TitleProperty *LauncherMain( TitleProperty *pTitleList )
 	TitleProperty *ret = NULL;
 	int brightness;
 	u16 dummy;
+	u16 tp_lr = 3;
 	
 	// RTC情報の取得＆表示
 	GetAndDrawRTCData( &g_rtcDraw, FALSE );
@@ -381,12 +399,18 @@ TitleProperty *LauncherMain( TitleProperty *pTitleList )
 	}
 	
 	//--------------------------------------
-	//  キー入力処理
+	//  タッチパッド・キー入力処理
 	//--------------------------------------
-	if(pad.cont & PAD_KEY_RIGHT){										// バナー選択
+	
+	if( tpd.disp.touch )
+	{
+		(void) SelectFunc( &tp_lr, &tpd.disp );
+	}
+	
+	if(pad.cont & PAD_KEY_RIGHT || tp_lr == 1){										// バナー選択
 		if(csr_v == 0) csr_v = 1;
 	}
-	if( pad.cont & PAD_KEY_LEFT ){
+	if( pad.cont & PAD_KEY_LEFT || tp_lr == 0){
 		if(csr_v == 0) csr_v = -1;
 	}
 	s_csr += csr_v;
diff --git a/build/systemMenu_RED/MachineSettings/ARM9/src/MachineSetting.c b/build/systemMenu_RED/MachineSettings/ARM9/src/MachineSetting.c
index c717f59a..4da7df6b 100644
--- a/build/systemMenu_RED/MachineSettings/ARM9/src/MachineSetting.c
+++ b/build/systemMenu_RED/MachineSettings/ARM9/src/MachineSetting.c
@@ -37,7 +37,7 @@
 
 // extern data------------------------------------------
 
-extern u32 bg_char_data[16 * 6];
+extern u32 bg_char_data[8 * 6];
 extern u16 bg_scr_data[32 * 32];
 
 // function's prototype declaration---------------------
diff --git a/build/systemMenu_RED/MachineSettings/ARM9/src/setOwnerInfo.c b/build/systemMenu_RED/MachineSettings/ARM9/src/setOwnerInfo.c
index e6ab76a8..a71be9fd 100644
--- a/build/systemMenu_RED/MachineSettings/ARM9/src/setOwnerInfo.c
+++ b/build/systemMenu_RED/MachineSettings/ARM9/src/setOwnerInfo.c
@@ -73,7 +73,7 @@ typedef enum NameOrComment
 
 // extern data----------------------------------
 
-extern u32 bg_char_data[16 * 6];
+extern u32 bg_char_data[8 * 6];
 extern u16 bg_scr_data[32 * 32];
 extern u16 bg_birth_scr_data[32 * 32];
 
diff --git a/build/systemMenu_RED/data/BGData_Launcher.c b/build/systemMenu_RED/data/BGData_Launcher.c
index 0141704c..45a5c749 100644
--- a/build/systemMenu_RED/data/BGData_Launcher.c
+++ b/build/systemMenu_RED/data/BGData_Launcher.c
@@ -1,5 +1,5 @@
 // BGキャラクタ
-u32 bg_char_data[16 * 5] = {
+u32 bg_char_data[8 * 6] = {
     0x00000000, 0x00000000, 0x00000000, 0x00000000,// 0000h
     0x00000000, 0x00000000, 0x00000000, 0x00000000,
     0x11111111, 0x44444444, 0x77777777, 0x99999999,// 0001h
@@ -10,10 +10,11 @@ u32 bg_char_data[16 * 5] = {
     0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
     0x11111111, 0x11111111, 0x11111111, 0x11111111,// 0004h
     0x11111111, 0x11111111, 0x11111111, 0x11111111,
+    0xffffffff, 0xffffff11, 0xffffff11, 0xffff11ff,// 0005h(＼)
+    0xffff11ff, 0xff11ffff, 0xff11ffff, 0x11ffffff,
 };
 
 
-
 // BGスクリーンデータ1
 u16 bg_scr_data[32 * 32]=
 {
@@ -55,10 +56,10 @@ u16 bg_scr_data[32 * 32]=
 	0x1003,0x1003,0x1003,0x1003,0x1003,0x1003,0x1003,0x1003,0x1003,0x1003,0x1003,0x1003,0x1003,0x1003,0x1003,0x1003,
 	0x1003,0x1003,0x1003,0x1003,0x1003,0x1003,0x1003,0x1003,0x1003,0x1003,0x1003,0x1003,0x1003,0x1003,0x1003,0x1003,//18
 	0x1003,0x1003,0x1003,0x1003,0x1003,0x1003,0x1003,0x1003,0x1003,0x1003,0x1003,0x1003,0x1003,0x1003,0x1003,0x1003,
-	0x1003,0x1003,0x1003,0x1003,0x1003,0x1003,0x1003,0x1003,0x1003,0x1003,0x1003,0x1003,0x1003,0x1003,0x1003,0x1003,//19
-	0x1003,0x1003,0x1003,0x1003,0x1003,0x1003,0x1003,0x1003,0x1003,0x1003,0x1003,0x1003,0x1003,0x1003,0x1003,0x1003,
-	0x1003,0x1003,0x1003,0x1003,0x1003,0x1003,0x1003,0x1003,0x1003,0x1003,0x1003,0x1003,0x1003,0x1003,0x1003,0x1003,//20
-	0x1003,0x1003,0x1003,0x1003,0x1003,0x1003,0x1003,0x1003,0x1003,0x1003,0x1003,0x1003,0x1003,0x1003,0x1003,0x1003,
+	0x1003,0x1003,0x1003,0x1003,0x1003,0x1003,0x1003,0x1003,0x1003,0x1003,0x1003,0x1405,0x1405,0x1405,0x1405,0x1003,//19
+	0x1003,0x1005,0x1005,0x1005,0x1005,0x1003,0x1003,0x1003,0x1003,0x1003,0x1003,0x1003,0x1003,0x1003,0x1003,0x1003,
+	0x1003,0x1003,0x1003,0x1003,0x1003,0x1003,0x1003,0x1003,0x1003,0x1003,0x1003,0x1c05,0x1c05,0x1c05,0x1c05,0x1003,//20
+	0x1003,0x1805,0x1805,0x1805,0x1805,0x1003,0x1003,0x1003,0x1003,0x1003,0x1003,0x1003,0x1003,0x1003,0x1003,0x1003,
 	0x1003,0x1003,0x1003,0x1003,0x1003,0x1003,0x1003,0x1003,0x1003,0x1003,0x1003,0x1003,0x1003,0x1003,0x1003,0x1003,//21
 	0x1003,0x1003,0x1003,0x1003,0x1003,0x1003,0x1003,0x1003,0x1003,0x1003,0x1003,0x1003,0x1003,0x1003,0x1003,0x1003,
 	0x1802,0x1802,0x1802,0x1802,0x1802,0x1802,0x1802,0x1802,0x1802,0x1802,0x1802,0x1802,0x1802,0x1802,0x1802,0x1802,//22
diff --git a/build/systemMenu_RED/data/BGData_MachineSettings.c b/build/systemMenu_RED/data/BGData_MachineSettings.c
index 3ed2693e..529bf33c 100644
--- a/build/systemMenu_RED/data/BGData_MachineSettings.c
+++ b/build/systemMenu_RED/data/BGData_MachineSettings.c
@@ -1,5 +1,5 @@
 // BGキャラクタ
-u32 bg_char_data[16 * 6] = {
+u32 bg_char_data[8 * 6] = {
     0x00000000, 0x00000000, 0x00000000, 0x00000000,// 0000h
     0x00000000, 0x00000000, 0x00000000, 0x00000000,
     0x11111111, 0x44444444, 0x77777777, 0x99999999,// 0001h