Compare commits
36 Commits
cleanup/cd
...
agent/w092
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
73e4ac93c7 | ||
|
|
1a1641d4d8 | ||
|
|
1e63e2d6a3 | ||
|
|
f2176b0824 | ||
|
|
48ccec19ea | ||
|
|
37c7ed66c9 | ||
|
|
0d43428526 | ||
|
|
9adb3e9996 | ||
|
|
82c2972066 | ||
|
|
42beb56024 | ||
|
|
43f6f77c15 | ||
|
|
3c4d73e4d1 | ||
|
|
b0fc50b103 | ||
|
|
6ec9f39ae7 | ||
|
|
4865afc664 | ||
|
|
40856d3a48 | ||
|
|
3d11c10ef1 | ||
|
|
98574fffcc | ||
|
|
9e56f9f587 | ||
|
|
960e1306cb | ||
|
|
b4a59ad689 | ||
|
|
830ddafdcc | ||
|
|
9eb648ea69 | ||
|
|
94e9a06c27 | ||
|
|
3abff608be | ||
|
|
5f000e6f7d | ||
|
|
fb938ba39d | ||
|
|
83f4b45d20 | ||
|
|
c6909021b7 | ||
|
|
78dbea9228 | ||
|
|
0b993824b3 | ||
|
|
a2f7638917 | ||
|
|
b0767c5338 | ||
|
|
f5a3ae1469 | ||
|
|
82ad173f9a | ||
|
|
e1b6078625 |
@@ -53,9 +53,9 @@ Progress
|
||||
<!-- progress:start -->
|
||||
| Decompiled | Matched | Linked | Data |
|
||||
|:---:|:---:|:---:|:---:|
|
||||
| 99.37% | 87.79% | 62.05% | 92.06% |
|
||||
| 98.27% | 85.37% | 59.71% | 90.53% |
|
||||
|
||||
units 918/1027 complete, functions 12216/12563 matched.
|
||||
units 805/1027 complete, functions 12090/12563 matched.
|
||||
|
||||
decompiled = code with a C/C++ implementation (objdiff fuzzy), matched = byte-exact code, linked = code actually linked into the DOL, data = byte-exact data
|
||||
<!-- progress:end -->
|
||||
|
||||
@@ -804,14 +804,14 @@ src/scene/sdChannelSelect/iplSDChannelObj.cpp:
|
||||
.rodata start:0x81610608 end:0x81610918
|
||||
.data start:0x81654B38 end:0x81654F98
|
||||
.sdata2 start:0x81694B18 end:0x81694B60
|
||||
.sdata start:0x81696DD0 end:0x81696E30
|
||||
.sdata start:0x81696DD0 end:0x81696E40
|
||||
|
||||
src/scene/sdChannelTitle/iplSDChannelTitle.cpp:
|
||||
.text start:0x813E4BBC end:0x813E947C
|
||||
.rodata start:0x81610918 end:0x81610948
|
||||
.data start:0x81654F98 end:0x81655638
|
||||
.sdata2 start:0x81694B60 end:0x81694B88
|
||||
.sdata start:0x81696E30 end:0x81696EF0
|
||||
.sdata start:0x81696E40 end:0x81696EF0
|
||||
|
||||
src/scene/sdButton/iplSDButton.cpp:
|
||||
.text start:0x813E947C end:0x813EA88C
|
||||
@@ -1054,7 +1054,7 @@ src/keyboard/tiNw4rManager.cpp:
|
||||
.data start:0x8165F818 end:0x8165F8F0
|
||||
.sdata2 start:0x81694E10 end:0x81694E28
|
||||
|
||||
src/keyboard/tiManager.cpp:
|
||||
src/keyboard/tiKeyboard.cpp:
|
||||
.text start:0x81437558 end:0x81439608
|
||||
.ctors start:0x8160D208 end:0x8160D20C
|
||||
.data start:0x8165F8F0 end:0x81660378
|
||||
@@ -1111,7 +1111,7 @@ src/keyboard/MyTiInputForm.cpp:
|
||||
|
||||
src/keyboard/MyTiLetterForm.cpp:
|
||||
.text start:0x81444730 end:0x814454D8
|
||||
.rodata start:0x816168B8 end:0x81616BC8
|
||||
.rodata start:0x816168B8 end:0x81616B88
|
||||
.data start:0x81668860 end:0x81668CD8
|
||||
.sdata2 start:0x81694EB0 end:0x81694ED0
|
||||
.sdata start:0x81697528 end:0x81697570
|
||||
@@ -1138,7 +1138,7 @@ src/keyboard/tiHKBManager.cpp:
|
||||
src/keyboard/tiHwKeyboard.cpp:
|
||||
.bss start:0x810C8940 end:0x810C8950
|
||||
.text start:0x81448AA4 end:0x81449C98
|
||||
.rodata start:0x81616BC8 end:0x81616C78
|
||||
.rodata start:0x81616B88 end:0x81616C78
|
||||
.data start:0x81668EF8 end:0x81669018
|
||||
.sdata2 start:0x81694EF8 end:0x81694F08
|
||||
.sdata start:0x81697570 end:0x81697578
|
||||
@@ -1405,7 +1405,7 @@ libs/RVLMiddleware/eZiText/src/clib/zikorean.c:
|
||||
extab start:0x81330748 end:0x81330760
|
||||
extabindex start:0x8133147C end:0x813314A0
|
||||
.text start:0x814813FC end:0x81482840
|
||||
.data start:0x8166B2B0 end:0x8166B3A8
|
||||
.data start:0x8166B2B0 end:0x8166B3D0
|
||||
|
||||
libs/RVLMiddleware/eZiText/src/clib/ziswordw.c:
|
||||
extab start:0x81330760 end:0x81330770
|
||||
@@ -1417,7 +1417,6 @@ libs/RVLMiddleware/eZiText/src/clib/zkokeyp.c:
|
||||
extab start:0x81330770 end:0x813307A8
|
||||
extabindex start:0x813314B8 end:0x8133150C
|
||||
.text start:0x8148302C end:0x8148447C
|
||||
.data start:0x8166B3A8 end:0x8166B3D0
|
||||
|
||||
libs/RVLMiddleware/eZiText/src/clib/zierror.c:
|
||||
.text start:0x8148447C end:0x81484484
|
||||
@@ -4193,11 +4192,11 @@ libs/RVL_SDK/src/fa/driver/nand_drv.c:
|
||||
.sbss start:0x816996C0 end:0x816996E0
|
||||
|
||||
libs/RVL_SDK/src/fa/driver/sd_drv.c:
|
||||
.bss start:0x811AF460 end:0x811AF6C0 align:32
|
||||
.bss start:0x811AF460 end:0x811AF6C0
|
||||
.text start:0x815EA41C end:0x815ED20C
|
||||
.rodata start:0x816329E8 end:0x81632B58
|
||||
.data start:0x81690D18 end:0x81691728
|
||||
.sbss start:0x816996E0 end:0x81699708 align:32
|
||||
.sbss start:0x816996E0 end:0x81699708
|
||||
|
||||
libs/RVL_SDK/src/fa/driver/pfd_cmn.c:
|
||||
.text start:0x815ED20C end:0x815ED324
|
||||
|
||||
@@ -1385,19 +1385,19 @@ getDiskBannerData__Q33ipl7channel7ManagerFib = .text:0x81339FB0; // type:functio
|
||||
titleIDtoPageIndex__Q33ipl7channel7ManagerCFUxPiPi = .text:0x8133A2BC; // type:function size:0xA0
|
||||
getLockedMsgFromBuf__Q33ipl7channel7ManagerCFPCQ33ipl7channel22SChanMgrDiskInMessages = .text:0x8133A35C; // type:function size:0xA8
|
||||
nand_error_handling__Q33ipl7channel7ManagerFi = .text:0x8133A404; // type:function size:0xDC
|
||||
findEntryByTitleId__Q33ipl7channel7ManagerFUx = .text:0x8133A4E0; // type:function size:0x9C
|
||||
getBannerCSIdx__Q33ipl7channel7ManagerFUx = .text:0x8133A57C; // type:function size:0x3C
|
||||
getSoundSize__Q33ipl7channel7ManagerFUx = .text:0x8133A5B8; // type:function size:0x38
|
||||
needsNetSetting__Q33ipl7channel7ManagerFUx = .text:0x8133A5F0; // type:function size:0x44
|
||||
usesAltSound__Q33ipl7channel7ManagerFUx = .text:0x8133A634; // type:function size:0x44
|
||||
isMissingTicket__Q33ipl7channel7ManagerFUx = .text:0x8133A678; // type:function size:0x40
|
||||
isNewsChannelV6Plus__Q33ipl7channel7ManagerFUx = .text:0x8133A6B8; // type:function size:0x84
|
||||
isOperaChannel__Q33ipl7channel7ManagerFUx = .text:0x8133A73C; // type:function size:0x68
|
||||
readBannerMetaAsync__Q33ipl7channel7ManagerFPQ23EGG4HeapUx = .text:0x8133A7A4; // type:function size:0xB8
|
||||
readSoundMetaAsync__Q33ipl7channel7ManagerFPQ23EGG4HeapUx = .text:0x8133A85C; // type:function size:0xC8
|
||||
readBannerCSAsync__Q33ipl7channel7ManagerFPQ23EGG4HeapUx = .text:0x8133A924; // type:function size:0xCC
|
||||
clearTmpChannel__Q33ipl7channel7ManagerFv = .text:0x8133A9F0; // type:function size:0x60
|
||||
unloadBanner__Q33ipl7channel7ManagerFUx = .text:0x8133AA50; // type:function size:0x30
|
||||
fn_8133A4E0__Q33ipl7channel7ManagerFUx = .text:0x8133A4E0; // type:function size:0x9C
|
||||
fn_8133A57C__Q33ipl7channel7ManagerFUx = .text:0x8133A57C; // type:function size:0x3C
|
||||
fn_8133A5B8__Q33ipl7channel7ManagerFUx = .text:0x8133A5B8; // type:function size:0x38
|
||||
fn_8133A5F0__Q33ipl7channel7ManagerFUx = .text:0x8133A5F0; // type:function size:0x44
|
||||
fn_8133A634__Q33ipl7channel7ManagerFUx = .text:0x8133A634; // type:function size:0x44
|
||||
fn_8133A678__Q33ipl7channel7ManagerFUx = .text:0x8133A678; // type:function size:0x40
|
||||
fn_8133A6B8__Q33ipl7channel7ManagerFUx = .text:0x8133A6B8; // type:function size:0x84
|
||||
fn_8133A73C__Q33ipl7channel7ManagerFUx = .text:0x8133A73C; // type:function size:0x68
|
||||
fn_8133A7A4__Q33ipl7channel7ManagerFPQ23EGG4HeapUx = .text:0x8133A7A4; // type:function size:0xB8
|
||||
fn_8133A85C__Q33ipl7channel7ManagerFPQ23EGG4HeapUx = .text:0x8133A85C; // type:function size:0xC8
|
||||
fn_8133A924__Q33ipl7channel7ManagerFPQ23EGG4HeapUx = .text:0x8133A924; // type:function size:0xCC
|
||||
fn_8133A9F0__Q33ipl7channel7ManagerFv = .text:0x8133A9F0; // type:function size:0x60
|
||||
fn_8133AA50__Q33ipl7channel7ManagerFUx = .text:0x8133AA50; // type:function size:0x30
|
||||
__ct__Q33ipl7channel20ChannelScriptManagerFv = .text:0x8133AA80; // type:function size:0x10
|
||||
create__Q33ipl7channel20ChannelScriptManagerFPQ23EGG7ExpHeap = .text:0x8133AA90; // type:function size:0x90
|
||||
init__Q33ipl7channel20ChannelScriptManagerFPQ33ipl4nand4FilePQ33ipl7channel9RsoThread = .text:0x8133AB20; // type:function size:0x3D4
|
||||
@@ -1761,7 +1761,7 @@ update_sd_app_location_async__Q23ipl12NandSDWorkerFPUl = .text:0x81348E30; // ty
|
||||
read_sd_app_location_async__Q23ipl12NandSDWorkerFPUl = .text:0x81348E44; // type:function size:0x14
|
||||
check_for_sd_app_to_nand_async__Q23ipl12NandSDWorkerFUxPQ33ipl12NandSDWorker13AppBlocksInfoPQ33ipl12NandSDWorker13AppBlocksInfo = .text:0x81348E58; // type:function size:0x30
|
||||
check_backup_fits_async__Q23ipl12NandSDWorkerFPQ33ipl12NandSDWorker11TitleIdListPQ33ipl12NandSDWorker11TitleIdList = .text:0x81348E88; // type:function size:0x20
|
||||
check_sd_app_titles_async__Q23ipl12NandSDWorkerFPvPvPv = .text:0x81348EA8; // type:function size:0x2C
|
||||
iplNandSD_81348EA8__Q23ipl12NandSDWorkerFPvPvPv = .text:0x81348EA8; // type:function size:0x2C
|
||||
get_nand_save_size_async__Q23ipl12NandSDWorkerFUx = .text:0x81348ED4; // type:function size:0x18
|
||||
get_nand_app_size_async__Q23ipl12NandSDWorkerFUx = .text:0x81348EEC; // type:function size:0x18
|
||||
delete_nand_save_async__Q23ipl12NandSDWorkerFUx = .text:0x81348F04; // type:function size:0x18
|
||||
@@ -1823,7 +1823,7 @@ do_read_sd_app_location__Q23ipl12NandSDWorkerFv = .text:0x8134BC60; // type:func
|
||||
do_check_for_sd_app_to_nand__Q23ipl12NandSDWorkerFv = .text:0x8134BED0; // type:function size:0x3C8
|
||||
check_backup_fits__Q23ipl12NandSDWorkerFv = .text:0x8134C298; // type:function size:0x3D8
|
||||
do_list_nand_apps_usage__Q23ipl12NandSDWorkerFv = .text:0x8134C670; // type:function size:0x1C8
|
||||
do_check_sd_app_titles__Q23ipl12NandSDWorkerFv = .text:0x8134C838; // type:function size:0x2D0
|
||||
do_unk_8134C838__Q23ipl12NandSDWorkerFv = .text:0x8134C838; // type:function size:0x2D0
|
||||
do_get_nand_save_size__Q23ipl12NandSDWorkerFv = .text:0x8134CB08; // type:function size:0x260
|
||||
do_get_nand_app_size__Q23ipl12NandSDWorkerFv = .text:0x8134CD68; // type:function size:0x1F4
|
||||
get_sd_save_size__Q23ipl12NandSDWorkerFUl = .text:0x8134CF5C; // type:function size:0x140
|
||||
@@ -2042,8 +2042,8 @@ isEqualChannel__Q33ipl8savedata7ManagerFUxUx = .text:0x813594B0; // type:functio
|
||||
isDefaultChannel__Q33ipl8savedata7ManagerFUlUl = .text:0x8135954C; // type:function size:0x50
|
||||
updateVersion__Q33ipl8savedata7ManagerFUlUl = .text:0x8135959C; // type:function size:0xD4
|
||||
setDefaultSDMenu__Q33ipl8savedata7ManagerFv = .text:0x81359670; // type:function size:0x48 scope:local
|
||||
pushTitleCache__Q33ipl8savedata7ManagerFUx = .text:0x813596B8; // type:function size:0xE8
|
||||
isTitleCached = .text:0x813597A0; // type:function size:0x40
|
||||
iplSavedata_813596B8__Q33ipl8savedata7ManagerFUx = .text:0x813596B8; // type:function size:0xE8
|
||||
iplSavedata_813597A0 = .text:0x813597A0; // type:function size:0x40 scope:local
|
||||
nand_error_handling__Q33ipl8savedata7ManagerFi = .text:0x813597E0; // type:function size:0xDC
|
||||
__ct__Q33ipl7channel9RsoThreadFPQ23EGG4Heap = .text:0x813598BC; // type:function size:0x6C
|
||||
__dt__Q33ipl7channel9RsoThreadFv = .text:0x81359928; // type:function size:0x70
|
||||
@@ -2095,7 +2095,7 @@ stt_wait_fns_msg__Q23ipl9CdbBackupFv = .text:0x8135B004; // type:function size:0
|
||||
stt_clean_up_back__Q23ipl9CdbBackupFv = .text:0x8135B030; // type:function size:0x60
|
||||
stt_wait_terminate__Q23ipl9CdbBackupFv = .text:0x8135B090; // type:function size:0x60
|
||||
error_handling__Q23ipl9CdbBackupFv = .text:0x8135B0F0; // type:function size:0xD0
|
||||
getProgressPercent__Q23ipl9CdbBackupFv = .text:0x8135B1C0; // type:function size:0x28
|
||||
fn_8135B1C0__Q23ipl9CdbBackupFv = .text:0x8135B1C0; // type:function size:0x28
|
||||
cdb_backup_delete_search_cb___3iplFPvP10_CDBRecord = .text:0x8135B1E8; // type:function size:0x8C
|
||||
cdb_backup_delete_task___3iplFPv = .text:0x8135B274; // type:function size:0xDC
|
||||
cdb_backup_move_search_cb___3iplFPvP10_CDBRecord = .text:0x8135B350; // type:function size:0xBC
|
||||
@@ -5126,8 +5126,8 @@ __ct__Q33ipl5scene10AOSSThreadFPQ23EGG4Heap = .text:0x813FCA0C; // type:function
|
||||
destroy__Q33ipl5scene10AOSSThreadFi = .text:0x813FCAA0; // type:function size:0x84
|
||||
__dt__Q33ipl5scene10AOSSThreadFv = .text:0x813FCB24; // type:function size:0x70
|
||||
start__Q33ipl5scene10AOSSThreadFv = .text:0x813FCB94; // type:function size:0xF8
|
||||
aossAlloc__Q33ipl5scene10AOSSThreadFv = .text:0x813FCC8C; // type:function size:0x58
|
||||
aossFree__Q33ipl5scene10AOSSThreadFv = .text:0x813FCCE4; // type:function size:0x50
|
||||
AOSSThread_813FCC8C__Q33ipl5scene10AOSSThreadFv = .text:0x813FCC8C; // type:function size:0x58
|
||||
AOSSThread_813FCCE4__Q33ipl5scene10AOSSThreadFv = .text:0x813FCCE4; // type:function size:0x50
|
||||
Run__Q33ipl5scene10AOSSThreadFv = .text:0x813FCD34; // type:function size:0xEC
|
||||
cancel__Q33ipl5scene10AOSSThreadFv = .text:0x813FCE20; // type:function size:0x50
|
||||
finish__Q33ipl5scene10AOSSThreadFP13NCDAossConfigPi = .text:0x813FCE70; // type:function size:0x2FC
|
||||
@@ -5267,10 +5267,10 @@ start_focusout_anm__Q33ipl5scene13SettingSelectFi = .text:0x814093D0; // type:fu
|
||||
start_selected_anm__Q33ipl5scene13SettingSelectFi = .text:0x81409480; // type:function size:0x274
|
||||
is_stopped_all_anm__Q33ipl5scene13SettingSelectCFv = .text:0x814096F4; // type:function size:0x74
|
||||
onEvent__Q33ipl5scene13SettingSelectFUlUlPv = .text:0x81409768; // type:function size:0xFC
|
||||
calc_exit_sequence__Q33ipl5scene13SettingSelectFv = .text:0x81409864; // type:function size:0x90
|
||||
prepare_exit_abort__Q33ipl5scene13SettingSelectFv = .text:0x814098F4; // type:function size:0x94
|
||||
start_exit_fade__Q33ipl5scene13SettingSelectFv = .text:0x81409988; // type:function size:0x64
|
||||
finish_exit_reboot__Q33ipl5scene13SettingSelectFv = .text:0x814099EC; // type:function size:0x198
|
||||
fn_81409864__Q33ipl5scene13SettingSelectFv = .text:0x81409864; // type:function size:0x90
|
||||
fn_814098F4__Q33ipl5scene13SettingSelectFv = .text:0x814098F4; // type:function size:0x94
|
||||
fn_81409988__Q33ipl5scene13SettingSelectFv = .text:0x81409988; // type:function size:0x64
|
||||
fn_814099EC__Q33ipl5scene13SettingSelectFv = .text:0x814099EC; // type:function size:0x198
|
||||
__dt__Q33ipl5scene13SettingSelectFv = .text:0x81409B84; // type:function size:0x58 scope:weak
|
||||
@20@__dt__Q33ipl5scene13SettingSelectFv = .text:0x81409BDC; // type:function size:0x8 scope:weak
|
||||
@84@onEvent__Q33ipl5scene13SettingSelectFUlUlPv = .text:0x81409BE4; // type:function size:0x8 scope:weak
|
||||
@@ -5576,7 +5576,7 @@ __sinit_\tiPcKeyboard_cpp = .text:0x81416F34; // type:function size:0x1B0
|
||||
@68@calc__Q49textinput8keyboard6pctype12LayoutByNW4RFv = .text:0x814170FC; // type:function size:0x8
|
||||
@68@draw__Q49textinput8keyboard6pctype12LayoutByNW4RFv = .text:0x81417104; // type:function size:0x8
|
||||
@68@init__Q49textinput8keyboard6pctype12LayoutByNW4RFv = .text:0x8141710C; // type:function size:0x8
|
||||
@236@onEvent__Q49textinput8keyboard6pctype12LayoutByNW4RFPQ49textinput8keyboard6pctype5UIObjUlPv = .text:0x81417114; // type:function size:0x8
|
||||
@236@onEvent__Q49textinput8keyboard6pctype12LayoutByNW4RFPQ49textinput8keyboard6pctype5 = .text:0x81417114; // type:function size:0x8
|
||||
create__Q49textinput8keyboard13cellphonetype4BaseFP12MEMAllocator = .text:0x8141711C; // type:function size:0xAC
|
||||
init__Q49textinput8keyboard13cellphonetype4BaseFv = .text:0x814171C8; // type:function size:0xA8
|
||||
calc__Q49textinput8keyboard13cellphonetype4BaseFv = .text:0x81417270; // type:function size:0x4
|
||||
@@ -5829,7 +5829,7 @@ doAfterDrawProcess__Q39textinput9inputform4BaseFPCwUlRCQ49textinput10textdrawer4
|
||||
finishDraw__Q39textinput9inputform4BaseFUl = .text:0x81427DC0; // type:function size:0x4
|
||||
addSender__Q29textinput15CommandReceiverFPQ29textinput13CommandSender = .text:0x81427DC4; // type:function size:0x8
|
||||
getDrawModifyStartLine__Q39textinput10textdrawer4BaseCFv = .text:0x81427DCC; // type:function size:0x8
|
||||
isEnableCursorCache__Q39textinput10textdrawer4BaseCFv = .text:0x81427DD4; // type:function size:0x8
|
||||
isEnableCursorCache__Q39textinput10textdrawer4BaseCFvgetStartPos__Q39textinput10textdrawer4BaseCFv = .text:0x81427DD4; // type:function size:0x8
|
||||
getStartPos__Q39textinput10textdrawer4BaseCFv = .text:0x81427DDC; // type:function size:0x8
|
||||
setVIWidth__Q39textinput10textdrawer4BaseFf = .text:0x81427DE4; // type:function size:0x8
|
||||
setCandidateBox__Q39textinput12candidatebox18CandidateBoxCallerFPQ39textinput12candidatebox4Base = .text:0x81427DEC; // type:function size:0x8
|
||||
@@ -13113,7 +13113,7 @@ pfstub_com_massage = .text:0x815E6C40; // type:function size:0xE4
|
||||
pfstub_store_result = .text:0x815E6D24; // type:function size:0xC4
|
||||
PFSYS_initializeSYS = .text:0x815E6DE8; // type:function size:0x4
|
||||
PFSYS_GetCurrentContextID = .text:0x815E6DEC; // type:function size:0x18
|
||||
PFSYS_TimeStamp = .text:0x815E6E04; // type:function size:0x7C
|
||||
PFSYS_TimeStamp = .text:0x815E6E04; // type:function size:0x74
|
||||
pfstub_call_function_standard = .text:0x815E6E80; // type:function size:0x584
|
||||
pfstub_attach = .text:0x815E7404; // type:function size:0x50
|
||||
pfstub_buffering = .text:0x815E7454; // type:function size:0x50
|
||||
@@ -13202,7 +13202,7 @@ pfd_sddrv_pread = .text:0x815EAADC; // type:function size:0x38
|
||||
pfd_sddrv_pwrite = .text:0x815EAB14; // type:function size:0x38
|
||||
pfd_sddrv_unmount = .text:0x815EAB4C; // type:function size:0x34
|
||||
pfd_sddrv_finalize = .text:0x815EAB80; // type:function size:0xE4
|
||||
pfd_sddrv_get_disk_info = .text:0x815EAC64; // type:function size:0x188
|
||||
pfd_sddrv_get_disk_info = .text:0x815EAC64; // type:function size:0x180
|
||||
pfd_sddrv_init_drv_tbl = .text:0x815EADEC; // type:function size:0x18
|
||||
pfd_sddrv_registar_callback = .text:0x815EAE04; // type:function size:0x10
|
||||
pfd_sddrv_is_media_insert = .text:0x815EAE14; // type:function size:0x98
|
||||
@@ -13986,8 +13986,8 @@ lbl_81616AE4 = .rodata:0x81616AE4; // type:object size:0x30
|
||||
lbl_81616B14 = .rodata:0x81616B14; // type:object size:0x74
|
||||
lbl_81616B88 = .rodata:0x81616B88; // type:object size:0x40
|
||||
lbl_81616BC8 = .rodata:0x81616BC8; // type:object size:0x10 data:4byte
|
||||
scCountryMap_EU = .rodata:0x81616BD8; // type:object size:0xC
|
||||
scCountryMap_NonEU = .rodata:0x81616BE4; // type:object size:0xC
|
||||
lbl_81616BD8 = .rodata:0x81616BD8; // type:object size:0xC
|
||||
lbl_81616BE4 = .rodata:0x81616BE4; // type:object size:0xC
|
||||
lbl_81616BF0 = .rodata:0x81616BF0; // type:object size:0x88
|
||||
CHANSVmConstStringObjectUndefined = .rodata:0x81616C78; // type:object size:0x10
|
||||
lbl_81616C88 = .rodata:0x81616C88; // type:object size:0x10
|
||||
@@ -14110,7 +14110,7 @@ hairColorTable$1737 = .rodata:0x8161DDDC; // type:object size:0xB4 scope:local
|
||||
eyeColorTable$1742 = .rodata:0x8161DE90; // type:object size:0x1E scope:local
|
||||
scDefaultData = .rodata:0x8161DEB0; // type:object size:0x1BC scope:local
|
||||
scDayMax$1845 = .rodata:0x8161E070; // type:object size:0xD scope:local
|
||||
scJpegAanScale = .rodata:0x8161E080; // type:object size:0x100 scope:local data:4byte
|
||||
lbl_8161E080 = .rodata:0x8161E080; // type:object size:0x100 scope:local data:4byte
|
||||
TMCJPEGDEC_SampleH_N = .rodata:0x8161E180; // type:object size:0x18 data:byte
|
||||
TMCJPEGDEC_SampleV_N = .rodata:0x8161E198; // type:object size:0x18 data:byte
|
||||
TMCJPEGDEC_Zigzag_data = .rodata:0x8161E1B0; // type:object size:0x40 data:byte
|
||||
@@ -14736,7 +14736,7 @@ lbl_81639189 = .data:0x81639189; // type:object size:0x39 data:string
|
||||
jumptable_816391C4 = .data:0x816391C4; // type:object size:0x30 scope:local
|
||||
__vt__Q33ipl8savedata7Manager = .data:0x816391F4; // type:object size:0xC
|
||||
__vt__Q33ipl7channel9RsoThread = .data:0x81639200; // type:object size:0x2C
|
||||
scRsoFatalMsg = .data:0x81639230; // type:object size:0x41 data:string
|
||||
lbl_81639230 = .data:0x81639230; // type:object size:0x41 data:string
|
||||
jumptable_81639278 = .data:0x81639278; // type:object size:0x44 scope:local
|
||||
lbl_816392BC = .data:0x816392BC; // type:object size:0xB data:string
|
||||
lbl_816392C7 = .data:0x816392C7; // type:object size:0x11 data:string
|
||||
@@ -14994,8 +14994,8 @@ __vt__Q37ext_ead3www14SurfaceManager = .data:0x81643AA0; // type:object size:0xC
|
||||
@1183 = .data:0x81643AB8; // type:object size:0x21 scope:local data:string
|
||||
__vt__Q37ext_ead3www9ut_thread = .data:0x81643ADC; // type:object size:0x28
|
||||
lbl_81643B08 = .data:0x81643B08; // type:object size:0x38
|
||||
scWwwTexBufFmt = .data:0x81643B40; // type:object size:0x1E data:string
|
||||
scWwwNoBrowserWin = .data:0x81643B5E; // type:object size:0x24 data:string
|
||||
lbl_81643B40 = .data:0x81643B40; // type:object size:0x1E data:string
|
||||
lbl_81643B5E = .data:0x81643B5E; // type:object size:0x24 data:string
|
||||
lbl_81643B82 = .data:0x81643B82; // type:object size:0x1B data:string
|
||||
lbl_81643B9D = .data:0x81643B9D; // type:object size:0x2B data:string
|
||||
lbl_81643BC8 = .data:0x81643BC8; // type:object size:0x12 data:string
|
||||
@@ -15655,15 +15655,15 @@ lbl_8164C424 = .data:0x8164C424; // type:object size:0xB data:string
|
||||
lbl_8164C42F = .data:0x8164C42F; // type:object size:0xD data:string
|
||||
lbl_8164C43C = .data:0x8164C43C; // type:object size:0xD data:string
|
||||
lbl_8164C449 = .data:0x8164C449; // type:object size:0xD data:string
|
||||
scPaneName_T_CalMonth = .data:0x8164C458; // type:object size:0xC data:4byte
|
||||
lbl_8164C458 = .data:0x8164C458; // type:object size:0xC data:4byte
|
||||
lbl_8164C464 = .data:0x8164C464; // type:object size:0x9 data:string
|
||||
lbl_8164C46D = .data:0x8164C46D; // type:object size:0x9 data:string
|
||||
lbl_8164C476 = .data:0x8164C476; // type:object size:0x9 data:string
|
||||
scPaneName_N_Cal = .data:0x8164C480; // type:object size:0xC
|
||||
lbl_8164C480 = .data:0x8164C480; // type:object size:0xC
|
||||
lbl_8164C48C = .data:0x8164C48C; // type:object size:0xB data:string
|
||||
lbl_8164C497 = .data:0x8164C497; // type:object size:0xB data:string
|
||||
lbl_8164C4A2 = .data:0x8164C4A2; // type:object size:0xB data:string
|
||||
scPaneName_N_CalPos = .data:0x8164C4B0; // type:object size:0xC
|
||||
lbl_8164C4B0 = .data:0x8164C4B0; // type:object size:0xC
|
||||
lbl_8164C4BC = .data:0x8164C4BC; // type:object size:0x43
|
||||
lbl_8164C4FF = .data:0x8164C4FF; // type:object size:0xF data:string
|
||||
lbl_8164C50E = .data:0x8164C50E; // type:object size:0x14 data:string
|
||||
@@ -15673,11 +15673,11 @@ lbl_8164C54E = .data:0x8164C54E; // type:object size:0x18
|
||||
lbl_8164C566 = .data:0x8164C566; // type:object size:0xC
|
||||
lbl_8164C572 = .data:0x8164C572; // type:object size:0xA
|
||||
__vt__Q33ipl5scene8Calendar = .data:0x8164C57C; // type:object size:0xA4
|
||||
scN_CalDay_r = .data:0x8164C620; // type:object size:0xB data:string
|
||||
scDateAnimPaneNames = .data:0x8164C62C; // type:object size:0x14 data:4byte
|
||||
scMyIplTopFBrlan = .data:0x8164C640; // type:object size:0x12 data:string
|
||||
scN_CalDay_t = .data:0x8164C652; // type:object size:0xB data:string
|
||||
scSEDateFocus = .data:0x8164C65D; // type:object size:0x13 data:string
|
||||
lbl_8164C620 = .data:0x8164C620; // type:object size:0xB data:string
|
||||
lbl_8164C62C = .data:0x8164C62C; // type:object size:0x14 data:4byte
|
||||
lbl_8164C640 = .data:0x8164C640; // type:object size:0x12 data:string
|
||||
lbl_8164C652 = .data:0x8164C652; // type:object size:0xB data:string
|
||||
lbl_8164C65D = .data:0x8164C65D; // type:object size:0x13 data:string
|
||||
__vt__Q33ipl5scene4Date = .data:0x8164C670; // type:object size:0x18
|
||||
@12712 = .data:0x8164C688; // type:object size:0xC scope:local data:string
|
||||
...data.0 = .data:0x8164C688; // type:label scope:local
|
||||
@@ -15796,20 +15796,20 @@ __vt__Q33ipl5scene11ChannelEdit = .data:0x8164CC1C; // type:object size:0x4C
|
||||
@17390 = .data:0x8164D00C; // type:object size:0x30 scope:local
|
||||
__vt__Q33ipl5scene11ChanAppBase = .data:0x8164D03C; // type:object size:0x28
|
||||
__vt__Q33ipl5scene13AnmController = .data:0x8164D0F8; // type:object size:0xC scope:weak
|
||||
scBrlan_SaveDataIn = .data:0x8164D108; // type:object size:0x25 data:string
|
||||
scBrlan_SaveDataOut = .data:0x8164D12D; // type:object size:0x26 data:string
|
||||
scBrlan_SaveDataFocusIn = .data:0x8164D153; // type:object size:0x2B data:string
|
||||
scBrlan_SaveDataFocusOut = .data:0x8164D17E; // type:object size:0x2C data:string
|
||||
scPaneName_N_Data16x9 = .data:0x8164D1AA; // type:object size:0xB data:string
|
||||
scPaneName_N_Data4x3 = .data:0x8164D1B5; // type:object size:0xA data:string
|
||||
scPaneName_B_Data_01 = .data:0x8164D1BF; // type:object size:0xA data:string
|
||||
scPaneName_B_Data_00 = .data:0x8164D1C9; // type:object size:0xA data:string
|
||||
scPaneName_N_Atari16x9 = .data:0x8164D1D3; // type:object size:0xC data:string
|
||||
scPaneName_N_Data_01 = .data:0x8164D1DF; // type:object size:0xA data:string
|
||||
scPaneName_N_Atari4x3 = .data:0x8164D1E9; // type:object size:0xB data:string
|
||||
scPaneName_N_Data_00 = .data:0x8164D1F4; // type:object size:0xA data:string
|
||||
scPaneName_DataBaseCover_00 = .data:0x8164D1FE; // type:object size:0x11 data:string
|
||||
scPaneName_DataBaseCover_01 = .data:0x8164D20F; // type:object size:0x11 data:string
|
||||
lbl_8164D108 = .data:0x8164D108; // type:object size:0x25 data:string
|
||||
lbl_8164D12D = .data:0x8164D12D; // type:object size:0x26 data:string
|
||||
lbl_8164D153 = .data:0x8164D153; // type:object size:0x2B data:string
|
||||
lbl_8164D17E = .data:0x8164D17E; // type:object size:0x2C data:string
|
||||
lbl_8164D1AA = .data:0x8164D1AA; // type:object size:0xB data:string
|
||||
lbl_8164D1B5 = .data:0x8164D1B5; // type:object size:0xA data:string
|
||||
lbl_8164D1BF = .data:0x8164D1BF; // type:object size:0xA data:string
|
||||
lbl_8164D1C9 = .data:0x8164D1C9; // type:object size:0xA data:string
|
||||
lbl_8164D1D3 = .data:0x8164D1D3; // type:object size:0xC data:string
|
||||
lbl_8164D1DF = .data:0x8164D1DF; // type:object size:0xA data:string
|
||||
lbl_8164D1E9 = .data:0x8164D1E9; // type:object size:0xB data:string
|
||||
lbl_8164D1F4 = .data:0x8164D1F4; // type:object size:0xA data:string
|
||||
lbl_8164D1FE = .data:0x8164D1FE; // type:object size:0x11 data:string
|
||||
lbl_8164D20F = .data:0x8164D20F; // type:object size:0x11 data:string
|
||||
__vt__Q33ipl5scene10ChanAppBox = .data:0x8164D220; // type:object size:0x28
|
||||
@18429 = .data:0x8164D2E8; // type:object size:0x20 scope:local data:string
|
||||
@18431 = .data:0x8164D308; // type:object size:0x21 scope:local data:string
|
||||
@@ -15940,19 +15940,19 @@ lbl_8164DCDF = .data:0x8164DCDF; // type:object size:0x35
|
||||
jumptable_8164DD14 = .data:0x8164DD14; // type:object size:0x6C scope:local
|
||||
lbl_8164DD80 = .data:0x8164DD80; // type:object size:0x37
|
||||
lbl_8164DDB7 = .data:0x8164DDB7; // type:object size:0xAD
|
||||
scPaneName_N_GCIcon = .data:0x8164DE64; // type:object size:0x9 data:string
|
||||
scPaneName_N_DiscUpdateIcon = .data:0x8164DE6D; // type:object size:0x11 data:string
|
||||
lbl_8164DE64 = .data:0x8164DE64; // type:object size:0x9 data:string
|
||||
lbl_8164DE6D = .data:0x8164DE6D; // type:object size:0x11 data:string
|
||||
jumptable_8164DE80 = .data:0x8164DE80; // type:object size:0x1C scope:local
|
||||
scSE_WSD_SELECT = .data:0x8164DE9C; // type:object size:0xB data:string
|
||||
lbl_8164DE9C = .data:0x8164DE9C; // type:object size:0xB data:string
|
||||
lbl_8164DEA7 = .data:0x8164DEA7; // type:object size:0x10 data:string
|
||||
lbl_8164DEB7 = .data:0x8164DEB7; // type:object size:0x114
|
||||
scSE_WIPL_SE_CH_TARGETTING = .data:0x8164DFCB; // type:object size:0x16 data:string
|
||||
scSE_WIPL_SE_CH_HOLD = .data:0x8164DFE1; // type:object size:0x10 data:string
|
||||
scSE_WIPL_SE_CH_SET = .data:0x8164DFF1; // type:object size:0xF data:string
|
||||
scSE_WIPL_SE_CH_NOT_MOVE = .data:0x8164E000; // type:object size:0x14 data:string
|
||||
lbl_8164DFCB = .data:0x8164DFCB; // type:object size:0x16 data:string
|
||||
lbl_8164DFE1 = .data:0x8164DFE1; // type:object size:0x10 data:string
|
||||
lbl_8164DFF1 = .data:0x8164DFF1; // type:object size:0xF data:string
|
||||
lbl_8164E000 = .data:0x8164E000; // type:object size:0x14 data:string
|
||||
lbl_8164E014 = .data:0x8164E014; // type:object size:0x10 data:string
|
||||
scSE_WIPL_SE_GRAY_BUTTON = .data:0x8164E024; // type:object size:0x14 data:string
|
||||
scSE_WIPL_SE_DECIDE = .data:0x8164E038; // type:object size:0xF data:string
|
||||
lbl_8164E024 = .data:0x8164E024; // type:object size:0x14 data:string
|
||||
lbl_8164E038 = .data:0x8164E038; // type:object size:0xF data:string
|
||||
__vt__Q33ipl4math29HermiteIntp<Q33ipl4math4VEC3> = .data:0x8164E048; // type:object size:0x20
|
||||
__vt__Q33ipl5scene27CsChanSelSDMenuEventHandler = .data:0x8164E068; // type:object size:0x1C
|
||||
__vt__Q33ipl5scene27CsChanSelButtonEventHandler = .data:0x8164E084; // type:object size:0x1C
|
||||
@@ -15968,61 +15968,61 @@ s_time_num__Q23ipl5scene = .data:0x8164E1D8; // type:object size:0x28 scope:loca
|
||||
@10797 = .data:0x8164E251; // type:object size:0x1A scope:local data:string
|
||||
@10804 = .data:0x8164E26B; // type:object size:0x19 scope:local data:string
|
||||
@10848 = .data:0x8164E284; // type:object size:0xA scope:local data:string
|
||||
scCursur_a = .data:0x8164E290; // type:object size:0x9 data:string
|
||||
lbl_8164E290 = .data:0x8164E290; // type:object size:0x9 data:string
|
||||
lbl_8164E299 = .data:0x8164E299; // type:object size:0x1B data:string
|
||||
lbl_8164E2B4 = .data:0x8164E2B4; // type:object size:0x1A data:string
|
||||
lbl_8164E2CE = .data:0x8164E2CE; // type:object size:0x19 data:string
|
||||
lbl_8164E2E8 = .data:0x8164E2E8; // type:object size:0xC
|
||||
lbl_8164E2F4 = .data:0x8164E2F4; // type:object size:0xA data:string
|
||||
lbl_8164E300 = .data:0x8164E300; // type:object size:0x28
|
||||
scModuleData = .data:0x8164E328; // type:object size:0x387
|
||||
scBrlan_RsoFmt = .data:0x8164E6AF; // type:object size:0x20
|
||||
scBrlyt_my_IplTop_b = .data:0x8164E6CF; // type:object size:0x12 data:string
|
||||
scBrlan_my_IplTop_b = .data:0x8164E6E1; // type:object size:0x12 data:string
|
||||
scBrlyt_my_IplTop_d = .data:0x8164E6F3; // type:object size:0x12 data:string
|
||||
scBrlyt_my_IplTopBalloon_a = .data:0x8164E705; // type:object size:0x19 data:string
|
||||
scBrlan_BalloonInOut = .data:0x8164E71E; // type:object size:0x26 data:string
|
||||
scSE_BALLOON = .data:0x8164E744; // type:object size:0x1F data:string
|
||||
scGroup_G_FocusBtnA = .data:0x8164E768; // type:object size:0xC data:string
|
||||
scGroup_G_FocusBtnB = .data:0x8164E774; // type:object size:0xC data:string
|
||||
scGroup_G_SelectBtnA = .data:0x8164E780; // type:object size:0xD data:string
|
||||
scGroup_G_SelectBtnB = .data:0x8164E78D; // type:object size:0xD data:string
|
||||
scGroup_G_OnOffBtnA = .data:0x8164E79A; // type:object size:0xC data:string
|
||||
scGroup_G_OnOffBtnB = .data:0x8164E7A6; // type:object size:0xC data:string
|
||||
scGroup_G_ChangeTextA = .data:0x8164E7B2; // type:object size:0xE data:string
|
||||
scGroup_G_ChangeTextB = .data:0x8164E7C0; // type:object size:0xE data:string
|
||||
lbl_8164E328 = .data:0x8164E328; // type:object size:0x387
|
||||
lbl_8164E6AF = .data:0x8164E6AF; // type:object size:0x20
|
||||
lbl_8164E6CF = .data:0x8164E6CF; // type:object size:0x12 data:string
|
||||
lbl_8164E6E1 = .data:0x8164E6E1; // type:object size:0x12 data:string
|
||||
lbl_8164E6F3 = .data:0x8164E6F3; // type:object size:0x12 data:string
|
||||
lbl_8164E705 = .data:0x8164E705; // type:object size:0x19 data:string
|
||||
lbl_8164E71E = .data:0x8164E71E; // type:object size:0x26 data:string
|
||||
lbl_8164E744 = .data:0x8164E744; // type:object size:0x1F data:string
|
||||
lbl_8164E768 = .data:0x8164E768; // type:object size:0xC data:string
|
||||
lbl_8164E774 = .data:0x8164E774; // type:object size:0xC data:string
|
||||
lbl_8164E780 = .data:0x8164E780; // type:object size:0xD data:string
|
||||
lbl_8164E78D = .data:0x8164E78D; // type:object size:0xD data:string
|
||||
lbl_8164E79A = .data:0x8164E79A; // type:object size:0xC data:string
|
||||
lbl_8164E7A6 = .data:0x8164E7A6; // type:object size:0xC data:string
|
||||
lbl_8164E7B2 = .data:0x8164E7B2; // type:object size:0xE data:string
|
||||
lbl_8164E7C0 = .data:0x8164E7C0; // type:object size:0xE data:string
|
||||
scAnimGroups__Q23ipl5scene = .data:0x8164E7D0; // type:object size:0x24
|
||||
scBrlan_my_ChTop_a_FocusBtnA_off = .data:0x8164E7F4; // type:object size:0x1F data:string
|
||||
scBrlan_my_ChTop_a_FocusBtn_on = .data:0x8164E813; // type:object size:0x1D data:string
|
||||
scBrlan_my_ChTop_a_SelectBtn_Ac = .data:0x8164E830; // type:object size:0x1E data:string
|
||||
scBrlan_my_ChTop_a_OffBtn = .data:0x8164E84E; // type:object size:0x18 data:string
|
||||
scBrlan_my_ChTop_a_OnBtn = .data:0x8164E866; // type:object size:0x17 data:string
|
||||
scBrlan_my_ChTop_a_ChangeTextOut = .data:0x8164E87D; // type:object size:0x1F data:string
|
||||
scBrlan_my_ChTop_a_ChangeTextIn = .data:0x8164E89C; // type:object size:0x1E data:string
|
||||
scBrlan_my_ChTop_a_ChangeIn = .data:0x8164E8BA; // type:object size:0x1A data:string
|
||||
scBrlan_my_ChTop_a_ChangeRoop = .data:0x8164E8D4; // type:object size:0x1C data:string
|
||||
scBrlan_my_ChTop_a_ChangeOut = .data:0x8164E8F0; // type:object size:0x1B data:string
|
||||
lbl_8164E7F4 = .data:0x8164E7F4; // type:object size:0x1F data:string
|
||||
lbl_8164E813 = .data:0x8164E813; // type:object size:0x1D data:string
|
||||
lbl_8164E830 = .data:0x8164E830; // type:object size:0x1E data:string
|
||||
lbl_8164E84E = .data:0x8164E84E; // type:object size:0x18 data:string
|
||||
lbl_8164E866 = .data:0x8164E866; // type:object size:0x17 data:string
|
||||
lbl_8164E87D = .data:0x8164E87D; // type:object size:0x1F data:string
|
||||
lbl_8164E89C = .data:0x8164E89C; // type:object size:0x1E data:string
|
||||
lbl_8164E8BA = .data:0x8164E8BA; // type:object size:0x1A data:string
|
||||
lbl_8164E8D4 = .data:0x8164E8D4; // type:object size:0x1C data:string
|
||||
lbl_8164E8F0 = .data:0x8164E8F0; // type:object size:0x1B data:string
|
||||
scAnimNames__Q23ipl5scene = .data:0x8164E90C; // type:object size:0x28
|
||||
scBrlan_banner = .data:0x8164E934; // type:object size:0xD data:string
|
||||
scBrlan_banner_Start = .data:0x8164E941; // type:object size:0x13 data:string
|
||||
scBrlan_banner_Loop = .data:0x8164E954; // type:object size:0x12 data:string
|
||||
lbl_8164E934 = .data:0x8164E934; // type:object size:0xD data:string
|
||||
lbl_8164E941 = .data:0x8164E941; // type:object size:0x13 data:string
|
||||
lbl_8164E954 = .data:0x8164E954; // type:object size:0x12 data:string
|
||||
scBannerAnims__Q23ipl5scene = .data:0x8164E968; // type:object size:0xC
|
||||
scGroup_G_Comment0 = .data:0x8164E974; // type:object size:0xB data:string
|
||||
scGroup_G_DiskIn = .data:0x8164E97F; // type:object size:0x9 data:string
|
||||
lbl_8164E974 = .data:0x8164E974; // type:object size:0xB data:string
|
||||
lbl_8164E97F = .data:0x8164E97F; // type:object size:0x9 data:string
|
||||
scDiskGroups__Q23ipl5scene = .data:0x8164E988; // type:object size:0x14 data:4byte
|
||||
scBrlan_my_DiskCh_a_Start = .data:0x8164E99C; // type:object size:0x18 data:string
|
||||
scBrlan_my_DiskCh_a_DiskStart = .data:0x8164E9B4; // type:object size:0x1C data:string
|
||||
scBrlan_my_DiskCh_a_DiskLoop = .data:0x8164E9D0; // type:object size:0x1B data:string
|
||||
scBrlan_my_DiskCh_a_DiskEnd = .data:0x8164E9EB; // type:object size:0x1A data:string
|
||||
scBrlan_my_DiskCh_a_DiskLost = .data:0x8164EA05; // type:object size:0x1B data:string
|
||||
scBrlan_my_DiskCh_a_DiskIn = .data:0x8164EA20; // type:object size:0x19 data:string
|
||||
scBrlan_my_DiskCh_a_DiskEject = .data:0x8164EA39; // type:object size:0x1C data:string
|
||||
scBrlan_my_DiskCh_a_Unknown = .data:0x8164EA55; // type:object size:0x1A data:string
|
||||
scBrlan_my_DiskCh_a_UnknownLoop = .data:0x8164EA6F; // type:object size:0x1E data:string
|
||||
scBrlan_my_DiskCh_a_UnknwnEject = .data:0x8164EA8D; // type:object size:0x1E data:string
|
||||
lbl_8164E99C = .data:0x8164E99C; // type:object size:0x18 data:string
|
||||
lbl_8164E9B4 = .data:0x8164E9B4; // type:object size:0x1C data:string
|
||||
lbl_8164E9D0 = .data:0x8164E9D0; // type:object size:0x1B data:string
|
||||
lbl_8164E9EB = .data:0x8164E9EB; // type:object size:0x1A data:string
|
||||
lbl_8164EA05 = .data:0x8164EA05; // type:object size:0x1B data:string
|
||||
lbl_8164EA20 = .data:0x8164EA20; // type:object size:0x19 data:string
|
||||
lbl_8164EA39 = .data:0x8164EA39; // type:object size:0x1C data:string
|
||||
lbl_8164EA55 = .data:0x8164EA55; // type:object size:0x1A data:string
|
||||
lbl_8164EA6F = .data:0x8164EA6F; // type:object size:0x1E data:string
|
||||
lbl_8164EA8D = .data:0x8164EA8D; // type:object size:0x1E data:string
|
||||
scDiskAnimNames__Q23ipl5scene = .data:0x8164EAAC; // type:object size:0x28 data:4byte
|
||||
scBrlyt_my_DiskCh_a = .data:0x8164EAD4; // type:object size:0x12 data:string
|
||||
scBrlan_my_GCTop_a_BackLoop = .data:0x8164EAE6; // type:object size:0x1A data:string
|
||||
lbl_8164EAD4 = .data:0x8164EAD4; // type:object size:0x12 data:string
|
||||
lbl_8164EAE6 = .data:0x8164EAE6; // type:object size:0x1A data:string
|
||||
scWidePanes__Q23ipl5scene = .data:0x8164EB00; // type:object size:0x30
|
||||
lbl_8164EB30 = .data:0x8164EB30; // type:object size:0xC data:string
|
||||
lbl_8164EB3C = .data:0x8164EB3C; // type:object size:0xCC
|
||||
@@ -18149,7 +18149,7 @@ lbl_8166A6B1 = .data:0x8166A6B1; // type:object size:0xD data:string
|
||||
lbl_8166A6BE = .data:0x8166A6BE; // type:object size:0xD data:string
|
||||
lbl_8166A6CB = .data:0x8166A6CB; // type:object size:0xC data:string
|
||||
lbl_8166A6D7 = .data:0x8166A6D7; // type:object size:0xC data:string
|
||||
scCsFatalMsg = .data:0x8166A6E3; // type:object size:0x41 data:string
|
||||
lbl_8166A6E3 = .data:0x8166A6E3; // type:object size:0x41 data:string
|
||||
lbl_8166A728 = .data:0x8166A728; // type:object size:0xB data:string
|
||||
lbl_8166A733 = .data:0x8166A733; // type:object size:0x9 data:string
|
||||
lbl_8166A73C = .data:0x8166A73C; // type:object size:0xB data:string
|
||||
@@ -18235,13 +18235,13 @@ jumptable_8166B3D0 = .data:0x8166B3D0; // type:object size:0x30 scope:local
|
||||
@1137 = .data:0x8166B450; // type:object size:0x22 scope:local data:string
|
||||
jumptable_8166B478 = .data:0x8166B478; // type:object size:0x30 scope:local
|
||||
lbl_8166B4B8 = .data:0x8166B4B8; // type:object size:0x70
|
||||
scCdbMsg_DatabaseClosed = .data:0x8166B528; // type:object size:0x25 data:string
|
||||
scCdbMsg_CantCreateRecordClosed = .data:0x8166B550; // type:object size:0x29 data:string
|
||||
scCdbMsg_CantCreateRecordReadonly = .data:0x8166B57C; // type:object size:0x2B data:string
|
||||
scCdbMsg_InvalidKey = .data:0x8166B5A8; // type:object size:0xD data:string
|
||||
scCdbMsg_FileNotFound = .data:0x8166B5B8; // type:object size:0x15 data:string
|
||||
scCdbMsg_CantCleanupDirsClosed = .data:0x8166B5D0; // type:object size:0x46 data:string
|
||||
scCdbMsg_CantCleanupDirsReadonly = .data:0x8166B618; // type:object size:0x48 data:string
|
||||
lbl_8166B528 = .data:0x8166B528; // type:object size:0x25 data:string
|
||||
lbl_8166B550 = .data:0x8166B550; // type:object size:0x29 data:string
|
||||
lbl_8166B57C = .data:0x8166B57C; // type:object size:0x2B data:string
|
||||
lbl_8166B5A8 = .data:0x8166B5A8; // type:object size:0xD data:string
|
||||
lbl_8166B5B8 = .data:0x8166B5B8; // type:object size:0x15 data:string
|
||||
lbl_8166B5D0 = .data:0x8166B5D0; // type:object size:0x46 data:string
|
||||
lbl_8166B618 = .data:0x8166B618; // type:object size:0x48 data:string
|
||||
@1360 = .data:0x8166B660; // type:object size:0x12 scope:local data:string
|
||||
...data.0 = .data:0x8166B660; // type:label scope:local
|
||||
@1362 = .data:0x8166B674; // type:object size:0x1C scope:local data:string
|
||||
@@ -18453,7 +18453,7 @@ __FUNCTION__$1195 = .data:0x8166E0FC; // type:object size:0x1C scope:local data:
|
||||
__FUNCTION__$1217 = .data:0x8166E118; // type:object size:0x1C scope:local data:string
|
||||
__FUNCTION__$1255 = .data:0x8166E134; // type:object size:0x14 scope:local data:string
|
||||
__FUNCTION__$1287 = .data:0x8166E148; // type:object size:0x18 scope:local data:string
|
||||
scNwc24FlPath = .data:0x8166E160; // type:object size:0x1A data:string
|
||||
lbl_8166E160 = .data:0x8166E160; // type:object size:0x1A data:string
|
||||
@583 = .data:0x8166E180; // type:object size:0x1B scope:local data:string
|
||||
__FUNCTION__$1123 = .data:0x8166E1A0; // type:object size:0x18 scope:local data:string
|
||||
@1300 = .data:0x8166E1B8; // type:object size:0x11 scope:local data:string
|
||||
@@ -18664,7 +18664,7 @@ __vt__Q34nw4r3lyt7Picture = .data:0x816717F4; // type:object size:0x6C
|
||||
@5574 = .data:0x816718E8; // type:object size:0x41 scope:local data:string
|
||||
__vt__Q34nw4r3lyt7TextBox = .data:0x8167192C; // type:object size:0x74
|
||||
flipInfos$7849 = .data:0x816719A0; // type:object size:0x3C scope:local
|
||||
scLytFatalMsg = .data:0x816719DC; // type:object size:0x41 data:string
|
||||
lbl_816719DC = .data:0x816719DC; // type:object size:0x41 data:string
|
||||
__vt__Q34nw4r3lyt6Window = .data:0x81671A20; // type:object size:0x7C
|
||||
__vt__Q34nw4r3lyt8Bounding = .data:0x81671AA0; // type:object size:0x64
|
||||
kColSels$4880 = .data:0x81671B08; // type:object size:0x20 scope:local data:4byte
|
||||
@@ -19181,13 +19181,13 @@ base64_array = .data:0x816874A0; // type:object size:0x80 scope:local
|
||||
@2185 = .data:0x816876A0; // type:object size:0x21 scope:local data:string
|
||||
@654 = .data:0x816876C8; // type:object size:0x48 scope:local data:string
|
||||
ShutdownFunctionInfo = .data:0x81687710; // type:object size:0x10 scope:local
|
||||
scWpadVersionStr = .data:0x81687720; // type:object size:0x49 data:string
|
||||
lbl_81687720 = .data:0x81687720; // type:object size:0x49 data:string
|
||||
lbl_8168776C = .data:0x8168776C; // type:object size:0x1C data:string
|
||||
lbl_81687788 = .data:0x81687788; // type:object size:0x1B data:string
|
||||
lbl_816877A4 = .data:0x816877A4; // type:object size:0x2F data:string
|
||||
lbl_816877D4 = .data:0x816877D4; // type:object size:0x27 data:string
|
||||
ShutdownFunctionInfo = .data:0x81687800; // type:object size:0x10 scope:local
|
||||
scWpadManageStrs = .data:0x81687810; // type:object size:0x58
|
||||
lbl_81687810 = .data:0x81687810; // type:object size:0x58
|
||||
lbl_81687868 = .data:0x81687868; // type:object size:0xC data:string
|
||||
lbl_81687874 = .data:0x81687874; // type:object size:0x37 data:string
|
||||
lbl_816878AC = .data:0x816878AC; // type:object size:0xB4
|
||||
@@ -20016,7 +20016,7 @@ lbl_81691040 = .data:0x81691040; // type:object size:0x2D0
|
||||
lbl_81691310 = .data:0x81691310; // type:object size:0x3B data:string
|
||||
lbl_8169134C = .data:0x8169134C; // type:object size:0x3DC
|
||||
st_uhs_msc_blk_func = .data:0x81691728; // type:object size:0x20
|
||||
__sdPathData = .data:0x81691748; // type:object size:0x50
|
||||
lbl_81691748 = .data:0x81691748; // type:object size:0x50
|
||||
lbl_81691798 = .data:0x81691798; // type:object size:0x16 data:string
|
||||
lbl_816917B0 = .data:0x816917B0; // type:object size:0xD data:string
|
||||
lbl_816917C0 = .data:0x816917C0; // type:object size:0x15 data:string
|
||||
@@ -20050,8 +20050,8 @@ lbl_816932D0 = .data:0x816932D0; // type:object size:0x48 data:string
|
||||
lbl_81693318 = .data:0x81693318; // type:object size:0xA data:string
|
||||
lbl_81693324 = .data:0x81693324; // type:object size:0x15 data:string
|
||||
@466 = .data:0x81693340; // type:object size:0xD scope:local data:string
|
||||
scCntCacheStrs = .data:0x81693350; // type:object size:0xD0
|
||||
scCntCacheTitleDataFmt = .data:0x81693420; // type:object size:0x16 data:string
|
||||
lbl_81693350 = .data:0x81693350; // type:object size:0xD0
|
||||
lbl_81693420 = .data:0x81693420; // type:object size:0x16 data:string
|
||||
__vt__Q23EGG9Allocator = .data:0x81693438; // type:object size:0x14
|
||||
__vt__Q23EGG9ArcPlayer = .data:0x81693450; // type:object size:0x54
|
||||
__vt__Q23EGG20SimpleAudioMgrWithFx = .data:0x816934A8; // type:object size:0x78
|
||||
@@ -20107,12 +20107,12 @@ gDBCommTable = .data:0x816943C8; // type:object size:0x28
|
||||
lbl_81694410 = .sdata2:0x81694410; // type:object size:0x4 align:4 data:float
|
||||
lbl_81694418 = .sdata2:0x81694418; // type:object size:0x8 align:8 data:double
|
||||
lbl_81694420 = .sdata2:0x81694420; // type:object size:0x4 align:4 data:float
|
||||
scOrthoLeft = .sdata2:0x81694424; // type:object size:0x4 align:4 data:float
|
||||
scOrthoRight = .sdata2:0x81694428; // type:object size:0x4 align:4 data:float
|
||||
scOrthoBottom = .sdata2:0x8169442C; // type:object size:0x4 align:4 data:float
|
||||
scOrthoTop = .sdata2:0x81694430; // type:object size:0x4 align:4 data:float
|
||||
scWideOrthoLeft = .sdata2:0x81694434; // type:object size:0x4 align:4 data:float
|
||||
scWideOrthoRight = .sdata2:0x81694438; // type:object size:0x4 align:4 data:float
|
||||
lbl_81694424 = .sdata2:0x81694424; // type:object size:0x4 align:4 data:float
|
||||
lbl_81694428 = .sdata2:0x81694428; // type:object size:0x4 align:4 data:float
|
||||
lbl_8169442C = .sdata2:0x8169442C; // type:object size:0x4 align:4 data:float
|
||||
lbl_81694430 = .sdata2:0x81694430; // type:object size:0x4 align:4 data:float
|
||||
lbl_81694434 = .sdata2:0x81694434; // type:object size:0x4 align:4 data:float
|
||||
lbl_81694438 = .sdata2:0x81694438; // type:object size:0x4 align:4 data:float
|
||||
lbl_81694440 = .sdata2:0x81694440; // type:object size:0x4 align:4 data:float
|
||||
lbl_81694444 = .sdata2:0x81694444; // type:object size:0x4 align:4 data:float
|
||||
lbl_81694448 = .sdata2:0x81694448; // type:object size:0x8 align:8 data:double
|
||||
@@ -20192,7 +20192,7 @@ lbl_816944EB = .sdata2:0x816944EB; // type:object size:0x1 data:byte
|
||||
@23221 = .sdata2:0x81694588; // type:object size:0x8 scope:local align:8 data:double
|
||||
lbl_81694590 = .sdata2:0x81694590; // type:object size:0x4 align:4 data:float
|
||||
lbl_81694594 = .sdata2:0x81694594; // type:object size:0x4 align:4 data:float
|
||||
scRsoZeroF = .sdata2:0x81694598; // type:object size:0x4 align:4 data:float
|
||||
lbl_81694598 = .sdata2:0x81694598; // type:object size:0x4 align:4 data:float
|
||||
lbl_816945A0 = .sdata2:0x816945A0; // type:object size:0x4 align:4 data:float
|
||||
lbl_816945A4 = .sdata2:0x816945A4; // type:object size:0x4 align:4 data:float
|
||||
lbl_816945A8 = .sdata2:0x816945A8; // type:object size:0x4 align:4 data:float
|
||||
@@ -20201,10 +20201,10 @@ lbl_816945B0 = .sdata2:0x816945B0; // type:object size:0x4 align:4 data:float
|
||||
lbl_816945B4 = .sdata2:0x816945B4; // type:object size:0x4 align:4 data:float
|
||||
lbl_816945B8 = .sdata2:0x816945B8; // type:object size:0x8 align:8 data:double
|
||||
lbl_816945C0 = .sdata2:0x816945C0; // type:object size:0x8 align:8 data:double
|
||||
scTvrcMsPerSec = .sdata2:0x816945C8; // type:object size:0x4 align:4 data:float
|
||||
scTvrcNsecPerSec = .sdata2:0x816945D0; // type:object size:0x8 align:8 data:double
|
||||
scTvrcOne = .sdata2:0x816945D8; // type:object size:0x8 align:8 data:double
|
||||
scTvrcFloatMagic = .sdata2:0x816945E0; // type:object size:0x8 align:8 data:double
|
||||
lbl_816945C8 = .sdata2:0x816945C8; // type:object size:0x4 align:4 data:float
|
||||
lbl_816945D0 = .sdata2:0x816945D0; // type:object size:0x8 align:8 data:double
|
||||
lbl_816945D8 = .sdata2:0x816945D8; // type:object size:0x8 align:8 data:double
|
||||
lbl_816945E0 = .sdata2:0x816945E0; // type:object size:0x8 align:8 data:double
|
||||
lbl_816945E8 = .sdata2:0x816945E8; // type:object size:0x4 align:4 data:float
|
||||
lbl_816945EC = .sdata2:0x816945EC; // type:object size:0x4 align:4 data:float
|
||||
lbl_816945F0 = .sdata2:0x816945F0; // type:object size:0x4 align:4 data:float
|
||||
@@ -20370,9 +20370,9 @@ lbl_816948E8 = .sdata2:0x816948E8; // type:object size:0x8 align:4 data:float
|
||||
@16092 = .sdata2:0x816948F4; // type:object size:0x4 scope:local align:4 data:float
|
||||
@16094 = .sdata2:0x816948F8; // type:object size:0x4 scope:local align:4 data:float
|
||||
@16095 = .sdata2:0x816948FC; // type:object size:0x4 scope:local align:4 data:float
|
||||
scHalfF = .sdata2:0x81694900; // type:object size:0x4 align:4 data:float
|
||||
scTwoF = .sdata2:0x81694904; // type:object size:0x4 align:4 data:float
|
||||
scF2IBias = .sdata2:0x81694908; // type:object size:0x8 align:8 data:double
|
||||
lbl_81694900 = .sdata2:0x81694900; // type:object size:0x4 align:4 data:float
|
||||
lbl_81694904 = .sdata2:0x81694904; // type:object size:0x4 align:4 data:float
|
||||
lbl_81694908 = .sdata2:0x81694908; // type:object size:0x8 align:8 data:double
|
||||
lbl_81694910 = .sdata2:0x81694910; // type:object size:0x4 align:4 data:float
|
||||
lbl_81694914 = .sdata2:0x81694914; // type:object size:0x4 align:4 data:float
|
||||
lbl_81694918 = .sdata2:0x81694918; // type:object size:0x4 align:4 data:float
|
||||
@@ -20710,12 +20710,12 @@ lbl_81694ECC = .sdata2:0x81694ECC; // type:object size:0x4 align:4 data:float
|
||||
@880 = .sdata2:0x81694ED4; // type:object size:0x4 scope:local align:4 data:float
|
||||
@885 = .sdata2:0x81694ED8; // type:object size:0x4 scope:local align:4 data:float
|
||||
@888 = .sdata2:0x81694EE0; // type:object size:0x8 scope:local align:8 data:double
|
||||
scGuiZeroF = .sdata2:0x81694EE8; // type:object size:0x4 align:4 data:float
|
||||
scGuiLineColorR = .sdata2:0x81694EEC; // type:object size:0x1 data:byte
|
||||
scGuiLineColorG = .sdata2:0x81694EED; // type:object size:0x1 data:byte
|
||||
scGuiLineColorB = .sdata2:0x81694EEE; // type:object size:0x1 data:byte
|
||||
scGuiLineColorA = .sdata2:0x81694EEF; // type:object size:0x1 data:byte
|
||||
scGuiHalfF = .sdata2:0x81694EF0; // type:object size:0x4 align:4 data:float
|
||||
lbl_81694EE8 = .sdata2:0x81694EE8; // type:object size:0x4 align:4 data:float
|
||||
lbl_81694EEC = .sdata2:0x81694EEC; // type:object size:0x1 data:byte
|
||||
lbl_81694EED = .sdata2:0x81694EED; // type:object size:0x1 data:byte
|
||||
lbl_81694EEE = .sdata2:0x81694EEE; // type:object size:0x1 data:byte
|
||||
lbl_81694EEF = .sdata2:0x81694EEF; // type:object size:0x1 data:byte
|
||||
lbl_81694EF0 = .sdata2:0x81694EF0; // type:object size:0x4 align:4 data:float
|
||||
lbl_81694EF8 = .sdata2:0x81694EF8; // type:object size:0x8 data:4byte
|
||||
lbl_81694F00 = .sdata2:0x81694F00; // type:object size:0x4 data:4byte
|
||||
lbl_81694F08 = .sdata2:0x81694F08; // type:object size:0x8 align:8 data:double
|
||||
@@ -20741,7 +20741,7 @@ lbl_81694FA0 = .sdata2:0x81694FA0; // type:object size:0x7 data:string
|
||||
lbl_81694FA7 = .sdata2:0x81694FA7; // type:object size:0x5 data:string
|
||||
lbl_81694FAC = .sdata2:0x81694FAC; // type:object size:0xC align:4
|
||||
lbl_81694FB8 = .sdata2:0x81694FB8; // type:object size:0x8 align:8 data:double
|
||||
scCsZeroF = .sdata2:0x81694FC0; // type:object size:0x4 align:4 data:float
|
||||
lbl_81694FC0 = .sdata2:0x81694FC0; // type:object size:0x4 align:4 data:float
|
||||
@10105 = .sdata2:0x81694FC8; // type:object size:0x4 scope:local align:4 data:float
|
||||
@9941 = .sdata2:0x81694FD0; // type:object size:0x8 scope:local data:4byte
|
||||
@10304 = .sdata2:0x81694FD8; // type:object size:0x8 scope:local align:8 data:double
|
||||
@@ -20769,12 +20769,12 @@ NET_AES_BLOCK_MODE_CBC = .sdata2:0x81695040; // type:object size:0x8
|
||||
@524 = .sdata2:0x81695050; // type:object size:0x2 scope:local data:byte
|
||||
@1077 = .sdata2:0x81695054; // type:object size:0x2 scope:local data:byte
|
||||
@1128 = .sdata2:0x81695058; // type:object size:0x2 scope:local data:byte
|
||||
scRsnOui0 = .sdata2:0x81695060; // type:object size:0x1 data:byte
|
||||
scRsnOui1 = .sdata2:0x81695061; // type:object size:0x1 data:byte
|
||||
scRsnOui2 = .sdata2:0x81695062; // type:object size:0x1 data:byte
|
||||
scWpaOui0 = .sdata2:0x81695064; // type:object size:0x1 data:byte
|
||||
scWpaOui1 = .sdata2:0x81695065; // type:object size:0x1 data:byte
|
||||
scWpaOui2 = .sdata2:0x81695066; // type:object size:0x1 data:byte
|
||||
lbl_81695060 = .sdata2:0x81695060; // type:object size:0x1 data:byte
|
||||
lbl_81695061 = .sdata2:0x81695061; // type:object size:0x1 data:byte
|
||||
lbl_81695062 = .sdata2:0x81695062; // type:object size:0x1 data:byte
|
||||
lbl_81695064 = .sdata2:0x81695064; // type:object size:0x1 data:byte
|
||||
lbl_81695065 = .sdata2:0x81695065; // type:object size:0x1 data:byte
|
||||
lbl_81695066 = .sdata2:0x81695066; // type:object size:0x1 data:byte
|
||||
scFilePermissions = .sdata2:0x81695068; // type:object size:0x2 scope:local
|
||||
cWhite = .sdata2:0x81695070; // type:object size:0x4 scope:local data:byte
|
||||
@2829 = .sdata2:0x81695074; // type:object size:0x4 scope:local align:4 data:float
|
||||
@@ -21025,10 +21025,10 @@ lbl_8169553B = .sdata2:0x8169553B; // type:object size:0x1 data:byte
|
||||
lbl_8169553C = .sdata2:0x8169553C; // type:object size:0x4 align:4 data:float
|
||||
lbl_81695540 = .sdata2:0x81695540; // type:object size:0x8 align:8 data:double
|
||||
lbl_81695548 = .sdata2:0x81695548; // type:object size:0x8 align:8 data:double
|
||||
scLytFatalColorR = .sdata2:0x81695550; // type:object size:0x1 data:byte
|
||||
scLytFatalColorG = .sdata2:0x81695551; // type:object size:0x1 data:byte
|
||||
scLytFatalColorB = .sdata2:0x81695552; // type:object size:0x1 data:byte
|
||||
scLytFatalColorA = .sdata2:0x81695553; // type:object size:0x5 data:byte
|
||||
lbl_81695550 = .sdata2:0x81695550; // type:object size:0x1 data:byte
|
||||
lbl_81695551 = .sdata2:0x81695551; // type:object size:0x1 data:byte
|
||||
lbl_81695552 = .sdata2:0x81695552; // type:object size:0x1 data:byte
|
||||
lbl_81695553 = .sdata2:0x81695553; // type:object size:0x5 data:byte
|
||||
@6184 = .sdata2:0x81695558; // type:object size:0x4 scope:local align:4 data:float
|
||||
@6185 = .sdata2:0x8169555C; // type:object size:0x4 scope:local align:4 data:float
|
||||
@6186 = .sdata2:0x81695560; // type:object size:0x4 scope:local align:4 data:float
|
||||
@@ -21548,10 +21548,10 @@ lbl_81696220 = .sdata:0x81696220; // type:object size:0x2 data:string
|
||||
lbl_81696222 = .sdata:0x81696222; // type:object size:0x2
|
||||
lbl_81696224 = .sdata:0x81696224; // type:object size:0x6 data:wstring
|
||||
lbl_8169622A = .sdata:0x8169622A; // type:object size:0x2
|
||||
scRsoFatalColorR = .sdata:0x8169622C; // type:object size:0x1 data:byte
|
||||
scRsoFatalColorG = .sdata:0x8169622D; // type:object size:0x1 data:byte
|
||||
scRsoFatalColorB = .sdata:0x8169622E; // type:object size:0x1 data:byte
|
||||
scRsoFatalColorA = .sdata:0x8169622F; // type:object size:0x1 data:byte
|
||||
lbl_8169622C = .sdata:0x8169622C; // type:object size:0x1 data:byte
|
||||
lbl_8169622D = .sdata:0x8169622D; // type:object size:0x1 data:byte
|
||||
lbl_8169622E = .sdata:0x8169622E; // type:object size:0x1 data:byte
|
||||
lbl_8169622F = .sdata:0x8169622F; // type:object size:0x1 data:byte
|
||||
lbl_81696230 = .sdata:0x81696230; // type:object size:0x5 data:string
|
||||
TVRC_FILE_HEADER__7LibTVRC = .sdata:0x81696238; // type:object size:0x4 data:4byte
|
||||
__tienHoseiNsec__7LibTVRC = .sdata:0x8169623C; // type:object size:0x4 data:4byte
|
||||
@@ -21589,7 +21589,7 @@ lbl_816962DB = .sdata:0x816962DB; // type:object size:0x8 data:string
|
||||
lbl_816962E3 = .sdata:0x816962E3; // type:object size:0x1
|
||||
lbl_816962E4 = .sdata:0x816962E4; // type:object size:0x8 data:string
|
||||
lbl_816962F0 = .sdata:0x816962F0; // type:object size:0x8 data:string
|
||||
scWwwErrorQ = .sdata:0x816962F8; // type:object size:0x8 data:string
|
||||
lbl_816962F8 = .sdata:0x816962F8; // type:object size:0x8 data:string
|
||||
globalNames__Q23www9trasition = .sdata:0x81696300; // type:object size:0x8 scope:local
|
||||
@1425 = .sdata:0x81696308; // type:object size:0x1 scope:local
|
||||
gEnableDpd = .sdata:0x81696310; // type:object size:0x4 data:4byte
|
||||
@@ -21753,7 +21753,7 @@ lbl_816966E1 = .sdata:0x816966E1; // type:object size:0x6 data:string
|
||||
lbl_816966E7 = .sdata:0x816966E7; // type:object size:0x7 data:string
|
||||
lbl_816966EE = .sdata:0x816966EE; // type:object size:0x7 data:string
|
||||
lbl_816966F5 = .sdata:0x816966F5; // type:object size:0x4 data:string
|
||||
scPaneName_B_Stop = .sdata:0x816966F9; // type:object size:0x7 data:string
|
||||
lbl_816966F9 = .sdata:0x816966F9; // type:object size:0x7 data:string
|
||||
lbl_81696700 = .sdata:0x81696700; // type:object size:0x6 data:string
|
||||
lbl_81696706 = .sdata:0x81696706; // type:object size:0x5 data:string
|
||||
lbl_8169670B = .sdata:0x8169670B; // type:object size:0x6 data:string
|
||||
@@ -21781,15 +21781,15 @@ lbl_81696797 = .sdata:0x81696797; // type:object size:0x8 data:string
|
||||
lbl_8169679F = .sdata:0x8169679F; // type:object size:0x8 data:string
|
||||
lbl_816967A7 = .sdata:0x816967A7; // type:object size:0x7 data:string
|
||||
lbl_816967AE = .sdata:0x816967AE; // type:object size:0x7 data:string
|
||||
scPaneName_T_Stop = .sdata:0x816967B5; // type:object size:0x7 data:string
|
||||
lbl_816967B5 = .sdata:0x816967B5; // type:object size:0x7 data:string
|
||||
lbl_816967C0 = .sdata:0x816967C0; // type:object size:0x4 data:string
|
||||
lbl_816967C4 = .sdata:0x816967C4; // type:object size:0x6 data:string
|
||||
lbl_816967CA = .sdata:0x816967CA; // type:object size:0x7 data:string
|
||||
scW_Cal = .sdata:0x816967D8; // type:object size:0x6 data:string
|
||||
scT_Cal = .sdata:0x816967DE; // type:object size:0x6 data:string
|
||||
scCal_Ac = .sdata:0x816967E4; // type:object size:0x7 data:string
|
||||
scInfo_a = .sdata:0x816967EB; // type:object size:0x7 data:string
|
||||
scB_Cal = .sdata:0x816967F2; // type:object size:0x6 data:string
|
||||
lbl_816967D8 = .sdata:0x816967D8; // type:object size:0x6 data:string
|
||||
lbl_816967DE = .sdata:0x816967DE; // type:object size:0x6 data:string
|
||||
lbl_816967E4 = .sdata:0x816967E4; // type:object size:0x7 data:string
|
||||
lbl_816967EB = .sdata:0x816967EB; // type:object size:0x7 data:string
|
||||
lbl_816967F2 = .sdata:0x816967F2; // type:object size:0x6 data:string
|
||||
@16087 = .sdata:0x816967F8; // type:object size:0x4 scope:local data:string
|
||||
@16350 = .sdata:0x816967FC; // type:object size:0x7 scope:local data:string
|
||||
@16351 = .sdata:0x81696803; // type:object size:0x7 scope:local data:string
|
||||
@@ -21802,8 +21802,8 @@ lbl_8169682A = .sdata:0x8169682A; // type:object size:0x7 data:string
|
||||
lbl_81696831 = .sdata:0x81696831; // type:object size:0x7 data:string
|
||||
lbl_81696838 = .sdata:0x81696838; // type:object size:0x7 data:string
|
||||
lbl_8169683F = .sdata:0x8169683F; // type:object size:0x7 data:string
|
||||
scGroup_G_Data = .sdata:0x81696848; // type:object size:0x7 data:string
|
||||
scUnknownWstr = .sdata:0x81696850; // type:object size:0x8 data:wstring
|
||||
lbl_81696848 = .sdata:0x81696848; // type:object size:0x7 data:string
|
||||
lbl_81696850 = .sdata:0x81696850; // type:object size:0x8 data:wstring
|
||||
s_all_pane_name__Q33ipl5scene10ChanAppBox = .sdata:0x81696858; // type:object size:0x6 data:string
|
||||
lbl_81696860 = .sdata:0x81696860; // type:object size:0x7 data:string
|
||||
lbl_81696867 = .sdata:0x81696867; // type:object size:0x7 data:string
|
||||
@@ -21858,11 +21858,11 @@ lbl_816968F5 = .sdata:0x816968F5; // type:object size:0x4 data:string
|
||||
@10922 = .sdata:0x81696992; // type:object size:0x3 scope:local data:string
|
||||
@10923 = .sdata:0x81696995; // type:object size:0x3 scope:local data:string
|
||||
lbl_81696998 = .sdata:0x81696998; // type:object size:0x4 data:4byte
|
||||
scPaneName_T_Balloon = .sdata:0x8169699C; // type:object size:0x4 data:4byte
|
||||
lbl_8169699C = .sdata:0x8169699C; // type:object size:0x4 data:4byte
|
||||
lbl_816969A0 = .sdata:0x816969A0; // type:object size:0x7 data:string
|
||||
scPaneName_W_Base = .sdata:0x816969A8; // type:object size:0x4 data:4byte
|
||||
lbl_816969A8 = .sdata:0x816969A8; // type:object size:0x4 data:4byte
|
||||
lbl_816969AC = .sdata:0x816969AC; // type:object size:0x8 data:string
|
||||
scPaneName_W_Shade = .sdata:0x816969B4; // type:object size:0x4 data:4byte
|
||||
lbl_816969B4 = .sdata:0x816969B4; // type:object size:0x4 data:4byte
|
||||
lbl_816969B8 = .sdata:0x816969B8; // type:object size:0x4 data:string
|
||||
lbl_816969BC = .sdata:0x816969BC; // type:object size:0x4 data:string
|
||||
lbl_816969C0 = .sdata:0x816969C0; // type:object size:0x4 data:string
|
||||
@@ -21872,41 +21872,41 @@ lbl_816969CC = .sdata:0x816969CC; // type:object size:0x4 data:string
|
||||
lbl_816969D0 = .sdata:0x816969D0; // type:object size:0x4 data:string
|
||||
lbl_816969D4 = .sdata:0x816969D4; // type:object size:0x4 data:string
|
||||
lbl_816969D8 = .sdata:0x816969D8; // type:object size:0x4 data:string
|
||||
scExport_Calc = .sdata:0x816969DC; // type:object size:0x5 data:string
|
||||
scExport_Create = .sdata:0x816969E1; // type:object size:0x7 data:string
|
||||
scArc = .sdata:0x816969E8; // type:object size:0x4 data:string
|
||||
lbl_816969DC = .sdata:0x816969DC; // type:object size:0x5 data:string
|
||||
lbl_816969E1 = .sdata:0x816969E1; // type:object size:0x7 data:string
|
||||
lbl_816969E8 = .sdata:0x816969E8; // type:object size:0x4 data:string
|
||||
lbl_816969EC = .sdata:0x816969EC; // type:object size:0x6 data:string
|
||||
lbl_816969F2 = .sdata:0x816969F2; // type:object size:0x5 data:string
|
||||
lbl_816969F7 = .sdata:0x816969F7; // type:object size:0x4 data:string
|
||||
lbl_816969FB = .sdata:0x816969FB; // type:object size:0x4 data:string
|
||||
lbl_816969FF = .sdata:0x816969FF; // type:object size:0x4 data:string
|
||||
lbl_81696A03 = .sdata:0x81696A03; // type:object size:0x7 data:string
|
||||
scPaneName_B_BtnA = .sdata:0x81696A10; // type:object size:0x7 data:string
|
||||
scPaneName_B_BtnB = .sdata:0x81696A17; // type:object size:0x7 data:string
|
||||
scPaneNames_B_Btn = .sdata:0x81696A20; // type:object size:0x8 data:4byte
|
||||
scGroup_Change = .sdata:0x81696A28; // type:object size:0x7 data:string
|
||||
scGroupNames_Change = .sdata:0x81696A30; // type:object size:0x4 data:4byte
|
||||
scGroup_G_Wii = .sdata:0x81696A34; // type:object size:0x6 data:string
|
||||
scGroup_G_GC = .sdata:0x81696A3A; // type:object size:0x5 data:string
|
||||
lbl_81696A10 = .sdata:0x81696A10; // type:object size:0x7 data:string
|
||||
lbl_81696A17 = .sdata:0x81696A17; // type:object size:0x7 data:string
|
||||
lbl_81696A20 = .sdata:0x81696A20; // type:object size:0x8 data:4byte
|
||||
lbl_81696A28 = .sdata:0x81696A28; // type:object size:0x7 data:string
|
||||
lbl_81696A30 = .sdata:0x81696A30; // type:object size:0x4 data:4byte
|
||||
lbl_81696A34 = .sdata:0x81696A34; // type:object size:0x6 data:string
|
||||
lbl_81696A3A = .sdata:0x81696A3A; // type:object size:0x5 data:string
|
||||
scLayoutNames__Q23ipl5scene = .sdata:0x81696A40; // type:object size:0x4 data:4byte
|
||||
scGroup_G_Back = .sdata:0x81696A44; // type:object size:0x7 data:string
|
||||
lbl_81696A44 = .sdata:0x81696A44; // type:object size:0x7 data:string
|
||||
scGCAnimGroups__Q23ipl5scene = .sdata:0x81696A4C; // type:object size:0x4 data:4byte
|
||||
scGCAnimNames__Q23ipl5scene = .sdata:0x81696A50; // type:object size:0x4 data:4byte
|
||||
scPaneName_Fre_a = .sdata:0x81696A54; // type:object size:0x6 data:string
|
||||
scPaneName_Fre_d = .sdata:0x81696A5A; // type:object size:0x6 data:string
|
||||
scPaneName_Fre_i = .sdata:0x81696A60; // type:object size:0x6 data:string
|
||||
scPaneName_Fre_l = .sdata:0x81696A66; // type:object size:0x6 data:string
|
||||
scPaneName_Fre_e = .sdata:0x81696A6C; // type:object size:0x6 data:string
|
||||
scPaneName_Fre_f = .sdata:0x81696A72; // type:object size:0x6 data:string
|
||||
scPaneName_Fre_g = .sdata:0x81696A78; // type:object size:0x6 data:string
|
||||
scPaneName_Fre_h = .sdata:0x81696A7E; // type:object size:0x6 data:string
|
||||
scPaneName_Fre_b = .sdata:0x81696A84; // type:object size:0x6 data:string
|
||||
scPaneName_Fre_c = .sdata:0x81696A8A; // type:object size:0x6 data:string
|
||||
scPaneName_Fre_j = .sdata:0x81696A90; // type:object size:0x6 data:string
|
||||
scPaneName_Fre_k = .sdata:0x81696A96; // type:object size:0x6 data:string
|
||||
scPaneName_T_BtnA = .sdata:0x81696A9C; // type:object size:0x7 data:string
|
||||
scPaneName_T_BtnB = .sdata:0x81696AA3; // type:object size:0x7 data:string
|
||||
scPaneNames_T_Btn__Q23ipl5scene = .sdata:0x81696AAC; // type:object size:0x8 data:4byte
|
||||
lbl_81696A54 = .sdata:0x81696A54; // type:object size:0x6 data:string
|
||||
lbl_81696A5A = .sdata:0x81696A5A; // type:object size:0x6 data:string
|
||||
lbl_81696A60 = .sdata:0x81696A60; // type:object size:0x6 data:string
|
||||
lbl_81696A66 = .sdata:0x81696A66; // type:object size:0x6 data:string
|
||||
lbl_81696A6C = .sdata:0x81696A6C; // type:object size:0x6 data:string
|
||||
lbl_81696A72 = .sdata:0x81696A72; // type:object size:0x6 data:string
|
||||
lbl_81696A78 = .sdata:0x81696A78; // type:object size:0x6 data:string
|
||||
lbl_81696A7E = .sdata:0x81696A7E; // type:object size:0x6 data:string
|
||||
lbl_81696A84 = .sdata:0x81696A84; // type:object size:0x6 data:string
|
||||
lbl_81696A8A = .sdata:0x81696A8A; // type:object size:0x6 data:string
|
||||
lbl_81696A90 = .sdata:0x81696A90; // type:object size:0x6 data:string
|
||||
lbl_81696A96 = .sdata:0x81696A96; // type:object size:0x6 data:string
|
||||
lbl_81696A9C = .sdata:0x81696A9C; // type:object size:0x7 data:string
|
||||
lbl_81696AA3 = .sdata:0x81696AA3; // type:object size:0x7 data:string
|
||||
lbl_81696AAC__Q23ipl5scene = .sdata:0x81696AAC; // type:object size:0x8 data:4byte
|
||||
lbl_81696AB4 = .sdata:0x81696AB4; // type:object size:0x4
|
||||
lbl_81696AB8 = .sdata:0x81696AB8; // type:object size:0x4
|
||||
lbl_81696ABC = .sdata:0x81696ABC; // type:object size:0x4 data:string
|
||||
@@ -22466,10 +22466,10 @@ lbl_81697824 = .sdata:0x81697824; // type:object size:0x8 data:string
|
||||
lbl_8169782C = .sdata:0x8169782C; // type:object size:0x8 data:string
|
||||
lbl_81697834 = .sdata:0x81697834; // type:object size:0x8 data:string
|
||||
lbl_8169783C = .sdata:0x8169783C; // type:object size:0x8 data:string
|
||||
scCsFatalColorR = .sdata:0x81697844; // type:object size:0x1 data:byte
|
||||
scCsFatalColorG = .sdata:0x81697845; // type:object size:0x1 data:byte
|
||||
scCsFatalColorB = .sdata:0x81697846; // type:object size:0x1 data:byte
|
||||
scCsFatalColorA = .sdata:0x81697847; // type:object size:0x1 data:byte
|
||||
lbl_81697844 = .sdata:0x81697844; // type:object size:0x1 data:byte
|
||||
lbl_81697845 = .sdata:0x81697845; // type:object size:0x1 data:byte
|
||||
lbl_81697846 = .sdata:0x81697846; // type:object size:0x1 data:byte
|
||||
lbl_81697847 = .sdata:0x81697847; // type:object size:0x1 data:byte
|
||||
lbl_81697848 = .sdata:0x81697848; // type:object size:0x8 data:string
|
||||
lbl_81697850 = .sdata:0x81697850; // type:object size:0x6 data:string
|
||||
lbl_81697858 = .sdata:0x81697858; // type:object size:0x6 data:string
|
||||
@@ -22538,7 +22538,7 @@ lbl_816979C8 = .sdata:0x816979C8; // type:object size:0x5 data:string
|
||||
lbl_816979D0 = .sdata:0x816979D0; // type:object size:0x5 data:string
|
||||
lbl_816979D8 = .sdata:0x816979D8; // type:object size:0x4 data:string
|
||||
lbl_816979E0 = .sdata:0x816979E0; // type:object size:0x8 data:string
|
||||
CDBFSPathSeparator = .sdata:0x816979E8; // type:object size:0x1 data:byte
|
||||
lbl_816979E8 = .sdata:0x816979E8; // type:object size:0x1 data:byte
|
||||
@1433 = .sdata:0x816979F0; // type:object size:0x4 scope:local data:string
|
||||
@1435 = .sdata:0x816979F4; // type:object size:0x1 scope:local
|
||||
@1440 = .sdata:0x816979F8; // type:object size:0x6 scope:local data:string
|
||||
@@ -22700,9 +22700,9 @@ __SSLVersion = .sdata:0x81697CE0; // type:object size:0x4 data:4byte
|
||||
qErr$1631 = .sdata:0x81697D58; // type:object size:0x4 scope:local data:4byte
|
||||
l_dev_nandflash_init_info = .sdata:0x81697D60; // type:object size:0x8 scope:local
|
||||
l_dev_sd_direct_init_info = .sdata:0x81697D68; // type:object size:0x8 scope:local
|
||||
scWpaFindOui0 = .sdata:0x81697D70; // type:object size:0x1 data:byte
|
||||
scWpaFindOui1 = .sdata:0x81697D71; // type:object size:0x1 data:byte
|
||||
scWpaFindOui2 = .sdata:0x81697D72; // type:object size:0x1 data:byte
|
||||
lbl_81697D70 = .sdata:0x81697D70; // type:object size:0x1 data:byte
|
||||
lbl_81697D71 = .sdata:0x81697D71; // type:object size:0x1 data:byte
|
||||
lbl_81697D72 = .sdata:0x81697D72; // type:object size:0x1 data:byte
|
||||
__RFLVersion = .sdata:0x81697D78; // type:object size:0x4 data:4byte
|
||||
sRFLLastErrCode = .sdata:0x81697D7C; // type:object size:0x4 scope:local data:4byte
|
||||
scResFileFullPathName = .sdata:0x81697D80; // type:object size:0x4 scope:local data:4byte
|
||||
@@ -23109,7 +23109,7 @@ lbl_816983EC = .sdata:0x816983EC; // type:object size:0x6 data:string
|
||||
__KBDVersion = .sdata:0x816985C8; // type:object size:0x4 data:4byte
|
||||
__KPRVersion = .sdata:0x816985D0; // type:object size:0x4 data:4byte
|
||||
__CNTCACHEVersion = .sdata:0x816985D8; // type:object size:0x4 data:4byte
|
||||
scCntCacheSpaceNl = .sdata:0x816985DC; // type:object size:0x3 data:string
|
||||
lbl_816985DC = .sdata:0x816985DC; // type:object size:0x3 data:string
|
||||
@428 = .sdata:0x816985E0; // type:object size:0x4 scope:local data:string
|
||||
@429 = .sdata:0x816985E4; // type:object size:0x3 scope:local data:string
|
||||
@442 = .sdata:0x816985E7; // type:object size:0x8 scope:local data:string
|
||||
@@ -23191,7 +23191,7 @@ _repeatBitLength__7LibTVRC = .sbss:0x81698768; // type:object size:0x4 data:4byt
|
||||
_repeatBitArray__7LibTVRC = .sbss:0x8169876C; // type:object size:0x4 data:4byte
|
||||
_tickT__7LibTVRC = .sbss:0x81698770; // type:object size:0x4 data:4byte
|
||||
m_handle__Q23ipl11TVRCManager = .sbss:0x81698778; // type:object size:0x4 data:4byte
|
||||
sTvrcStartDelay__3ipl = .sbss:0x8169877C; // type:object size:0x4 data:4byte
|
||||
lbl_8169877C__3ipl = .sbss:0x8169877C; // type:object size:0x4 data:4byte
|
||||
suIDCounter__Q23gui11PaneManager = .sbss:0x81698780; // type:object size:0x4 data:4byte
|
||||
_bgmBlk__Q23ipl3snd = .sbss:0x81698788; // type:object size:0x4
|
||||
_mainBGMHandle__Q23ipl3snd = .sbss:0x8169878C; // type:object size:0x4 data:4byte
|
||||
@@ -23331,7 +23331,7 @@ opera_callbacks__Q23www10wiisetting = .sbss:0x816989A0; // type:object size:0x4
|
||||
sStatus__Q23www9arcreader = .sbss:0x816989A8; // type:object size:0x4 scope:local data:4byte
|
||||
lbl_816989B0 = .sbss:0x816989B0; // type:object size:0x4 data:4byte
|
||||
sBatteryFlag__Q210homebutton10Controller = .sbss:0x816989B8; // type:object size:0x4
|
||||
sAlarmCreated__Q210homebutton10Controller = .sbss:0x816989BC; // type:object size:0x4
|
||||
lbl_816989BC__Q210homebutton10Controller = .sbss:0x816989BC; // type:object size:0x4
|
||||
suIDCounter__Q310homebutton3gui11PaneManager = .sbss:0x816989C0; // type:object size:0x4 data:4byte
|
||||
spInstance__Q210homebutton9RemoteSpk = .sbss:0x816989C8; // type:object size:0x4 data:4byte
|
||||
InvalidShutdown = .sbss:0x816989D0; // type:object size:0x4 data:4byte
|
||||
|
||||
224
configure.py
224
configure.py
@@ -812,8 +812,8 @@ config.libs = [
|
||||
]
|
||||
),
|
||||
IPLSection("memoryCard", [
|
||||
Object(Matching, "scene/memoryCard/iplMemoryCard.cpp"),
|
||||
Object(Matching, "scene/memoryCard/iplMemoryCardBase.cpp"),
|
||||
Object(NonMatching, "scene/memoryCard/iplMemoryCard.cpp"),
|
||||
Object(NonMatching, "scene/memoryCard/iplMemoryCardBase.cpp"),
|
||||
Object(NonMatching, "scene/memoryCard/iplMemoryCardManager.cpp"),
|
||||
Object(Matching, "scene/memoryCard/iplGCSaveData.cpp"),
|
||||
Object(NonMatching, "scene/memoryCard/iplGCWindow.cpp"),
|
||||
@@ -918,9 +918,9 @@ config.libs = [
|
||||
Object(NonMatching, "keyboard/tiString.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(NonMatching, "keyboard/tiAtokString.cpp", extra_cflags=["-O4,p"]), # for 4.3J
|
||||
Object(NonMatching, "keyboard/tiZiString.cpp", extra_cflags=["-O4,p"]), # for 4.3U and 4.3E
|
||||
Object(Matching, "keyboard/tiTextDrawer.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(NonMatching, "keyboard/tiTextDrawer.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(Matching, "keyboard/tiNw4rManager.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(NonMatching, "keyboard/tiManager.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(NonMatching, "keyboard/tiKeyboard.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(Matching, "keyboard/tiUtil.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(Matching, "keyboard/tiCpData.cpp", extra_cflags=["-O4,p"], shift_jis=False),
|
||||
Object(Matching, "keyboard/tiSwData.cpp", extra_cflags=["-O4,p"], shift_jis=False),
|
||||
@@ -929,7 +929,7 @@ config.libs = [
|
||||
Object(Matching, "keyboard/tiTextInputBase.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(NonMatching, "keyboard/MyTiManager.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(NonMatching, "keyboard/MyTiInputForm.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(Matching, "keyboard/MyTiLetterForm.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(NonMatching, "keyboard/MyTiLetterForm.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(Matching, "keyboard/MyTiBg.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(Matching, "keyboard/tiDebug.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(Matching, "keyboard/tiGUIManager.cpp", extra_cflags=["-O4,p"]),
|
||||
@@ -987,7 +987,7 @@ config.libs = [
|
||||
Object(NonMatching, "clib/zi8alpha.c"),
|
||||
Object(Matching, "clib/zi8alts.c"),
|
||||
Object(NonMatching, "clib/zi8cgetc.c"),
|
||||
Object(Matching, "clib/zi8cinfo.c"),
|
||||
Object(NonMatching, "clib/zi8cinfo.c"),
|
||||
Object(Matching, "clib/zi8copy.c"),
|
||||
Object(NonMatching, "clib/zi8dawg.c"),
|
||||
Object(Matching, "clib/zi8getc.c"),
|
||||
@@ -1004,7 +1004,7 @@ config.libs = [
|
||||
Object(Matching, "clib/zi8ver.c"),
|
||||
Object(Matching, "clib/zi8ZHuwd.c"),
|
||||
Object(NonMatching, "clib/zidawg1.c"),
|
||||
Object(Matching, "clib/zikorean.c"),
|
||||
Object(NonMatching, "clib/zikorean.c"),
|
||||
Object(NonMatching, "clib/ziswordw.c"),
|
||||
Object(NonMatching, "clib/zkokeyp.c"),
|
||||
Object(Matching, "clib/zierror.c"),
|
||||
@@ -1025,7 +1025,7 @@ config.libs = [
|
||||
Object(NonMatching, "cdb/CDBRecord.c"),
|
||||
Object(Matching, "cdb/CDBRecordFile.c"),
|
||||
Object(Matching, "cdb/CDBRecordKey.c"),
|
||||
Object(Matching, "cdb/CDBIntArray.c"),
|
||||
Object(NonMatching, "cdb/CDBIntArray.c"),
|
||||
Object(Matching, "cdb/CDBSystem.c"),
|
||||
Object(Matching, "cdb/CDBAttr.c"),
|
||||
Object(Matching, "cdb/CDBFBridge.c"),
|
||||
@@ -1044,9 +1044,9 @@ config.libs = [
|
||||
Object(Matching, "net/nettime.c"),
|
||||
Object(Matching, "net/crc.c"),
|
||||
Object(NonMatching, "net/md5.c"),
|
||||
Object(Matching, "net/sha1.c"),
|
||||
Object(NonMatching, "net/sha1.c"),
|
||||
Object(NonMatching, "net/hmac.c"),
|
||||
Object(Matching, "net/neterrorcode.c"),
|
||||
Object(NonMatching, "net/neterrorcode.c"),
|
||||
Object(Matching, "net/NETVersion.c"),
|
||||
Object(NonMatching, "net/aes.c"),
|
||||
Object(Matching, "net/wireless_macaddr.c"),
|
||||
@@ -1687,9 +1687,9 @@ config.libs = [
|
||||
Object(Matching, "fa/pf_service.c"),
|
||||
Object(Matching, "fa/pf_str.c"),
|
||||
Object(Matching, "fa/pf_driver.c"),
|
||||
Object(Matching, "fa/pdm_api.c"),
|
||||
Object(Matching, "fa/pdm_bpb.c"),
|
||||
Object(Matching, "fa/pdm_disk.c"),
|
||||
Object(NonMatching, "fa/pdm_api.c"),
|
||||
Object(NonMatching, "fa/pdm_bpb.c"),
|
||||
Object(NonMatching, "fa/pdm_disk.c"),
|
||||
Object(NonMatching, "fa/pdm_partition.c"),
|
||||
Object(NonMatching, "fa/pf_cache.c"),
|
||||
Object(NonMatching, "fa/pf_cluster.c"),
|
||||
@@ -1698,133 +1698,133 @@ config.libs = [
|
||||
Object(NonMatching, "fa/pf_entry_iterator.c"),
|
||||
Object(NonMatching, "fa/pf_fat.c"),
|
||||
Object(NonMatching, "fa/pf_fat12.c"),
|
||||
Object(Matching, "fa/pf_fat16.c"),
|
||||
Object(Matching, "fa/pf_fat32.c"),
|
||||
Object(NonMatching, "fa/pf_fat16.c"),
|
||||
Object(NonMatching, "fa/pf_fat32.c"),
|
||||
Object(Matching, "fa/pf_fatfs.c"),
|
||||
Object(NonMatching, "fa/pf_file.c"),
|
||||
Object(NonMatching, "fa/pf_path.c"),
|
||||
Object(Matching, "fa/pf_sector.c"),
|
||||
Object(NonMatching, "fa/pf_sector.c"),
|
||||
Object(NonMatching, "fa/pf_volume.c"),
|
||||
Object(Matching, "fa/pf_volume_apiadd.c"),
|
||||
Object(Matching, "fa/pf_cp932.c"),
|
||||
Object(NonMatching, "fa/pf_volume_apiadd.c"),
|
||||
Object(NonMatching, "fa/pf_cp932.c"),
|
||||
Object(Matching, "fa/pf_api_util.c"),
|
||||
Object(Matching, "fa/pf_attach.c"),
|
||||
Object(Matching, "fa/pf_buffering.c"),
|
||||
Object(Matching, "fa/pf_cdelete.c"),
|
||||
Object(Matching, "fa/pf_chdir.c"),
|
||||
Object(Matching, "fa/pf_chdmod.c"),
|
||||
Object(Matching, "fa/pf_chmod.c"),
|
||||
Object(Matching, "fa/pf_cinsert.c"),
|
||||
Object(NonMatching, "fa/pf_buffering.c"),
|
||||
Object(NonMatching, "fa/pf_cdelete.c"),
|
||||
Object(NonMatching, "fa/pf_chdir.c"),
|
||||
Object(NonMatching, "fa/pf_chdmod.c"),
|
||||
Object(NonMatching, "fa/pf_chmod.c"),
|
||||
Object(NonMatching, "fa/pf_cinsert.c"),
|
||||
Object(Matching, "fa/pf_closedir.c"),
|
||||
Object(Matching, "fa/pf_combine.c"),
|
||||
Object(Matching, "fa/pf_create.c"),
|
||||
Object(Matching, "fa/pf_createdir.c"),
|
||||
Object(Matching, "fa/pf_cut.c"),
|
||||
Object(Matching, "fa/pf_derrnum.c"),
|
||||
Object(NonMatching, "fa/pf_combine.c"),
|
||||
Object(NonMatching, "fa/pf_create.c"),
|
||||
Object(NonMatching, "fa/pf_createdir.c"),
|
||||
Object(NonMatching, "fa/pf_cut.c"),
|
||||
Object(NonMatching, "fa/pf_derrnum.c"),
|
||||
Object(Matching, "fa/pf_detach.c"),
|
||||
Object(Matching, "fa/pf_divide.c"),
|
||||
Object(NonMatching, "fa/pf_divide.c"),
|
||||
Object(Matching, "fa/pf_errnum.c"),
|
||||
Object(Matching, "fa/pf_fadjust.c"),
|
||||
Object(Matching, "fa/pf_fappend.c"),
|
||||
Object(Matching, "fa/pf_fchdir.c"),
|
||||
Object(NonMatching, "fa/pf_fadjust.c"),
|
||||
Object(NonMatching, "fa/pf_fappend.c"),
|
||||
Object(NonMatching, "fa/pf_fchdir.c"),
|
||||
Object(Matching, "fa/pf_fclose.c"),
|
||||
Object(Matching, "fa/pf_fconcat.c"),
|
||||
Object(NonMatching, "fa/pf_fconcat.c"),
|
||||
Object(Matching, "fa/pf_feof.c"),
|
||||
Object(Matching, "fa/pf_ferror.c"),
|
||||
Object(Matching, "fa/pf_finfo.c"),
|
||||
Object(NonMatching, "fa/pf_finfo.c"),
|
||||
Object(Matching, "fa/pf_flock.c"),
|
||||
Object(Matching, "fa/pf_fopen.c"),
|
||||
Object(Matching, "fa/pf_format.c"),
|
||||
Object(NonMatching, "fa/pf_format.c"),
|
||||
Object(Matching, "fa/pf_fread.c"),
|
||||
Object(Matching, "fa/pf_fseek.c"),
|
||||
Object(Matching, "fa/pf_fsetclstlink.c"),
|
||||
Object(Matching, "fa/pf_fsexec.c"),
|
||||
Object(NonMatching, "fa/pf_fsetclstlink.c"),
|
||||
Object(NonMatching, "fa/pf_fsexec.c"),
|
||||
Object(Matching, "fa/pf_fsfirst.c"),
|
||||
Object(Matching, "fa/pf_fsnext.c"),
|
||||
Object(Matching, "fa/pf_fstat.c"),
|
||||
Object(Matching, "fa/pf_fsync.c"),
|
||||
Object(Matching, "fa/pf_fwrite.c"),
|
||||
Object(Matching, "fa/pf_getdev.c"),
|
||||
Object(Matching, "fa/pf_getvol.c"),
|
||||
Object(Matching, "fa/pf_getvolcfg.c"),
|
||||
Object(Matching, "fa/pf_init_prfile2.c"),
|
||||
Object(Matching, "fa/pf_insert.c"),
|
||||
Object(Matching, "fa/pf_iswriteprotected.c"),
|
||||
Object(NonMatching, "fa/pf_getdev.c"),
|
||||
Object(NonMatching, "fa/pf_getvol.c"),
|
||||
Object(NonMatching, "fa/pf_getvolcfg.c"),
|
||||
Object(NonMatching, "fa/pf_init_prfile2.c"),
|
||||
Object(NonMatching, "fa/pf_insert.c"),
|
||||
Object(NonMatching, "fa/pf_iswriteprotected.c"),
|
||||
Object(Matching, "fa/pf_mkdir.c"),
|
||||
Object(Matching, "fa/pf_mount.c"),
|
||||
Object(Matching, "fa/pf_move.c"),
|
||||
Object(NonMatching, "fa/pf_move.c"),
|
||||
Object(Matching, "fa/pf_opendir.c"),
|
||||
Object(Matching, "fa/pf_readdir.c"),
|
||||
Object(Matching, "fa/pf_regctx.c"),
|
||||
Object(NonMatching, "fa/pf_regctx.c"),
|
||||
Object(Matching, "fa/pf_remove.c"),
|
||||
Object(Matching, "fa/pf_rename.c"),
|
||||
Object(Matching, "fa/pf_rewinddir.c"),
|
||||
Object(Matching, "fa/pf_rmdir.c"),
|
||||
Object(Matching, "fa/pf_rmvvol.c"),
|
||||
Object(NonMatching, "fa/pf_rmvvol.c"),
|
||||
Object(Matching, "fa/pf_seekdir.c"),
|
||||
Object(Matching, "fa/pf_setclstlink.c"),
|
||||
Object(Matching, "fa/pf_setcode.c"),
|
||||
Object(Matching, "fa/pf_setencode.c"),
|
||||
Object(Matching, "fa/pf_settailbuf.c"),
|
||||
Object(Matching, "fa/pf_setupfsi.c"),
|
||||
Object(Matching, "fa/pf_setvol.c"),
|
||||
Object(Matching, "fa/pf_setvolcfg.c"),
|
||||
Object(Matching, "fa/pf_sync.c"),
|
||||
Object(NonMatching, "fa/pf_setclstlink.c"),
|
||||
Object(NonMatching, "fa/pf_setcode.c"),
|
||||
Object(NonMatching, "fa/pf_setencode.c"),
|
||||
Object(NonMatching, "fa/pf_settailbuf.c"),
|
||||
Object(NonMatching, "fa/pf_setupfsi.c"),
|
||||
Object(NonMatching, "fa/pf_setvol.c"),
|
||||
Object(NonMatching, "fa/pf_setvolcfg.c"),
|
||||
Object(NonMatching, "fa/pf_sync.c"),
|
||||
Object(Matching, "fa/pf_telldir.c"),
|
||||
Object(Matching, "fa/pf_unmount.c"),
|
||||
Object(Matching, "fa/pf_unregctx.c"),
|
||||
Object(Matching, "fa/pf_xdivide.c"),
|
||||
Object(NonMatching, "fa/pf_unregctx.c"),
|
||||
Object(NonMatching, "fa/pf_xdivide.c"),
|
||||
Object(Matching, "fa/pf_w_api_util.c"),
|
||||
Object(Matching, "fa/pf_w_cdelete.c"),
|
||||
Object(Matching, "fa/pf_w_chdir.c"),
|
||||
Object(Matching, "fa/pf_w_chdmod.c"),
|
||||
Object(Matching, "fa/pf_w_chmod.c"),
|
||||
Object(Matching, "fa/pf_w_cinsert.c"),
|
||||
Object(Matching, "fa/pf_w_combine.c"),
|
||||
Object(Matching, "fa/pf_w_create.c"),
|
||||
Object(Matching, "fa/pf_w_createdir.c"),
|
||||
Object(Matching, "fa/pf_w_cut.c"),
|
||||
Object(Matching, "fa/pf_w_divide.c"),
|
||||
Object(Matching, "fa/pf_w_fconcat.c"),
|
||||
Object(Matching, "fa/pf_w_fopen.c"),
|
||||
Object(Matching, "fa/pf_w_fsexec.c"),
|
||||
Object(Matching, "fa/pf_w_fsfirst.c"),
|
||||
Object(Matching, "fa/pf_w_fsnext.c"),
|
||||
Object(Matching, "fa/pf_w_fstat.c"),
|
||||
Object(Matching, "fa/pf_w_insert.c"),
|
||||
Object(Matching, "fa/pf_w_mkdir.c"),
|
||||
Object(Matching, "fa/pf_w_move.c"),
|
||||
Object(Matching, "fa/pf_w_opendir.c"),
|
||||
Object(Matching, "fa/pf_w_remove.c"),
|
||||
Object(Matching, "fa/pf_w_rename.c"),
|
||||
Object(Matching, "fa/pf_w_rmdir.c"),
|
||||
Object(Matching, "fa/pf_w_xdivide.c"),
|
||||
Object(Matching, "fa/pf_filelock.c"),
|
||||
Object(Matching, "fa/pf_stub.c"),
|
||||
Object(Matching, "fa/pf_system.c"),
|
||||
Object(Matching, "fa/pf_stub_standard.c"),
|
||||
Object(Matching, "fa/pfs_attach.c"),
|
||||
Object(Matching, "fa/pfs_buffering.c"),
|
||||
Object(Matching, "fa/pfs_create.c"),
|
||||
Object(Matching, "fa/pfs_createdir.c"),
|
||||
Object(Matching, "fa/pfs_detach.c"),
|
||||
Object(Matching, "fa/pfs_errnum.c"),
|
||||
Object(Matching, "fa/pfs_fclose.c"),
|
||||
Object(Matching, "fa/pfs_finfot.c"),
|
||||
Object(Matching, "fa/pfs_fopen.c"),
|
||||
Object(Matching, "fa/pfs_format.c"),
|
||||
Object(Matching, "fa/pfs_fread.c"),
|
||||
Object(Matching, "fa/pfs_fseek.c"),
|
||||
Object(Matching, "fa/pfs_fsfirst.c"),
|
||||
Object(Matching, "fa/pfs_fsnext.c"),
|
||||
Object(Matching, "fa/pfs_fstat.c"),
|
||||
Object(Matching, "fa/pfs_fwrite.c"),
|
||||
Object(Matching, "fa/pfs_getdev.c"),
|
||||
Object(Matching, "fa/pfs_init_prfile2.c"),
|
||||
Object(Matching, "fa/pfs_mount.c"),
|
||||
Object(Matching, "fa/pfs_remove.c"),
|
||||
Object(Matching, "fa/pfs_unmount.c"),
|
||||
Object(Matching, "fa/pf_stub_unicode.c"),
|
||||
Object(NonMatching, "fa/pf_w_cdelete.c"),
|
||||
Object(NonMatching, "fa/pf_w_chdir.c"),
|
||||
Object(NonMatching, "fa/pf_w_chdmod.c"),
|
||||
Object(NonMatching, "fa/pf_w_chmod.c"),
|
||||
Object(NonMatching, "fa/pf_w_cinsert.c"),
|
||||
Object(NonMatching, "fa/pf_w_combine.c"),
|
||||
Object(NonMatching, "fa/pf_w_create.c"),
|
||||
Object(NonMatching, "fa/pf_w_createdir.c"),
|
||||
Object(NonMatching, "fa/pf_w_cut.c"),
|
||||
Object(NonMatching, "fa/pf_w_divide.c"),
|
||||
Object(NonMatching, "fa/pf_w_fconcat.c"),
|
||||
Object(NonMatching, "fa/pf_w_fopen.c"),
|
||||
Object(NonMatching, "fa/pf_w_fsexec.c"),
|
||||
Object(NonMatching, "fa/pf_w_fsfirst.c"),
|
||||
Object(NonMatching, "fa/pf_w_fsnext.c"),
|
||||
Object(NonMatching, "fa/pf_w_fstat.c"),
|
||||
Object(NonMatching, "fa/pf_w_insert.c"),
|
||||
Object(NonMatching, "fa/pf_w_mkdir.c"),
|
||||
Object(NonMatching, "fa/pf_w_move.c"),
|
||||
Object(NonMatching, "fa/pf_w_opendir.c"),
|
||||
Object(NonMatching, "fa/pf_w_remove.c"),
|
||||
Object(NonMatching, "fa/pf_w_rename.c"),
|
||||
Object(NonMatching, "fa/pf_w_rmdir.c"),
|
||||
Object(NonMatching, "fa/pf_w_xdivide.c"),
|
||||
Object(NonMatching, "fa/pf_filelock.c"),
|
||||
Object(NonMatching, "fa/pf_stub.c"),
|
||||
Object(NonMatching, "fa/pf_system.c"),
|
||||
Object(NonMatching, "fa/pf_stub_standard.c"),
|
||||
Object(NonMatching, "fa/pfs_attach.c"),
|
||||
Object(NonMatching, "fa/pfs_buffering.c"),
|
||||
Object(NonMatching, "fa/pfs_create.c"),
|
||||
Object(NonMatching, "fa/pfs_createdir.c"),
|
||||
Object(NonMatching, "fa/pfs_detach.c"),
|
||||
Object(NonMatching, "fa/pfs_errnum.c"),
|
||||
Object(NonMatching, "fa/pfs_fclose.c"),
|
||||
Object(NonMatching, "fa/pfs_finfot.c"),
|
||||
Object(NonMatching, "fa/pfs_fopen.c"),
|
||||
Object(NonMatching, "fa/pfs_format.c"),
|
||||
Object(NonMatching, "fa/pfs_fread.c"),
|
||||
Object(NonMatching, "fa/pfs_fseek.c"),
|
||||
Object(NonMatching, "fa/pfs_fsfirst.c"),
|
||||
Object(NonMatching, "fa/pfs_fsnext.c"),
|
||||
Object(NonMatching, "fa/pfs_fstat.c"),
|
||||
Object(NonMatching, "fa/pfs_fwrite.c"),
|
||||
Object(NonMatching, "fa/pfs_getdev.c"),
|
||||
Object(NonMatching, "fa/pfs_init_prfile2.c"),
|
||||
Object(NonMatching, "fa/pfs_mount.c"),
|
||||
Object(NonMatching, "fa/pfs_remove.c"),
|
||||
Object(NonMatching, "fa/pfs_unmount.c"),
|
||||
Object(NonMatching, "fa/pf_stub_unicode.c"),
|
||||
|
||||
Object(NonMatching, "fa/api/FAAttach.c"),
|
||||
Object(Matching, "fa/api/FABuffering.c"),
|
||||
@@ -1851,15 +1851,15 @@ config.libs = [
|
||||
Object(Matching, "fa/api/FASetThreadPriority.c"),
|
||||
Object(Matching, "fa/api/FAUnmount.c"),
|
||||
|
||||
Object(Matching, "fa/kernel/pfk_api.c"),
|
||||
Object(NonMatching, "fa/kernel/pfk_api.c"),
|
||||
|
||||
Object(Matching, "fa/driver/nand_drv.c"),
|
||||
Object(NonMatching, "fa/driver/sd_drv.c"),
|
||||
Object(Matching, "fa/driver/pfd_cmn.c"),
|
||||
Object(NonMatching, "fa/driver/pfd_cmn.c"),
|
||||
Object(Matching, "fa/driver/msc_drv.c"),
|
||||
|
||||
Object(Matching, "fa/msc/puh_msc.c"),
|
||||
Object(Matching, "fa/msc/puh_msc_cmd.c"),
|
||||
Object(NonMatching, "fa/msc/puh_msc.c"),
|
||||
Object(NonMatching, "fa/msc/puh_msc_cmd.c"),
|
||||
Object(NonMatching, "fa/msc/puh_msc_blk.c"),
|
||||
]
|
||||
),
|
||||
@@ -1887,7 +1887,7 @@ config.libs = [
|
||||
RVLSDKLib("kbd", [
|
||||
Object(NonMatching, "kbd/kbd_lib.c"),
|
||||
Object(NonMatching, "kbd/kbd_lib_map_jp.c"),
|
||||
Object(Matching, "kbd/kbd_lib_map_us.c"),
|
||||
Object(NonMatching, "kbd/kbd_lib_map_us.c"),
|
||||
Object(NonMatching, "kbd/kbd_lib_map_eu.c"),
|
||||
]
|
||||
),
|
||||
|
||||
@@ -96,7 +96,7 @@ CHANSVmNativeClass* CHANSVmAddNativeClass(CHANSVm* vm, const char* clsName, CHAN
|
||||
/*** CHANS Image ***/
|
||||
/************************/
|
||||
|
||||
typedef vmBoolInt (*CHANSVmImageCtorCallback)(CHANSVm* vm, vmPtr data);
|
||||
typedef vmBoolInt (*CHANSVmImageCtorCallback)(CHANSVm* vm);
|
||||
typedef vmPtr (*CHANSVmImageAllocatorCallback)(CHANSVm* vm, u32 size);
|
||||
|
||||
void CHANSVmImageRegisterAllocator(CHANSVmImageAllocatorCallback allocCb, CHANSVmImageCtorCallback ctorCb);
|
||||
|
||||
@@ -75,7 +75,7 @@ namespace homebutton {
|
||||
|
||||
private:
|
||||
static bool sBatteryFlag[WPAD_MAX_CONTROLLERS];
|
||||
static bool sAlarmCreated[WPAD_MAX_CONTROLLERS];
|
||||
static bool lbl_816989BC[WPAD_MAX_CONTROLLERS];
|
||||
|
||||
static OSAlarm sAlarm[WPAD_MAX_CONTROLLERS];
|
||||
static OSAlarm sAlarmSoundOff[WPAD_MAX_CONTROLLERS];
|
||||
|
||||
@@ -35,8 +35,8 @@ namespace ext_ead {
|
||||
|
||||
class SurfaceManager {
|
||||
public:
|
||||
static void CreateManager(int surfaceW, int surfaceH, int browserW, int browserH, void* mem1Buf, u32 mem1BufSize, void* mem2Buf, u32 mem2BufSize,
|
||||
void* libBuf, const char* arcPath);
|
||||
static void CreateManager(int rectW0, int rectH0, int rectW1, int rectH1, void* mem1Buf, u32 mem1BufSize, void* mem2Buf, u32 mem2BufSize,
|
||||
void* libBuf, const char* param_10);
|
||||
static void DisposeManager();
|
||||
|
||||
static void RegisterArcFile(void* fileBuf);
|
||||
|
||||
@@ -14,17 +14,11 @@ namespace textinput {
|
||||
|
||||
class LayoutByNW4R : public Base, public nw4rmanager::Layout {
|
||||
public:
|
||||
#ifdef MYTIMANAGER_IMPLEMENTATION
|
||||
LayoutByNW4R(nw4r::lyt::MultiArcResourceAccessor* multiArc, const char* layoutName, EventObserver* event)
|
||||
: nw4rmanager::Layout(multiArc, layoutName, event) {}
|
||||
#endif
|
||||
#if defined(MYTIMANAGER_MATCHING)
|
||||
LayoutByNW4R(nw4r::lyt::MultiArcResourceAccessor* resAccessor, const char* layoutBinName,
|
||||
EventObserver* event)
|
||||
: nw4rmanager::Layout(resAccessor, layoutBinName, event) {}
|
||||
|
||||
virtual ~LayoutByNW4R() {}
|
||||
#elif defined(MYTIMANAGER_IMPLEMENTATION)
|
||||
virtual ~LayoutByNW4R();
|
||||
#else
|
||||
virtual ~LayoutByNW4R() {}
|
||||
#endif
|
||||
|
||||
virtual void create(MEMAllocator* allocator);
|
||||
virtual void init();
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
|
||||
#include "tiInputForm.h"
|
||||
#include "tiString.h"
|
||||
#include "tiUtil.h"
|
||||
|
||||
#include <nw4r/lyt/pane.h>
|
||||
|
||||
@@ -20,9 +21,7 @@ namespace textinput {
|
||||
virtual void moveNigaoeButton() {}
|
||||
};
|
||||
|
||||
#if defined(MYTIINPUTFORM_IMPLEMENTATION) || defined(MYTILETTERFORM_IMPLEMENTATION)
|
||||
class ScrollButton;
|
||||
#endif
|
||||
|
||||
class InputForm : public textinput::InputForm {
|
||||
public:
|
||||
@@ -34,51 +33,24 @@ namespace textinput {
|
||||
EM_Last
|
||||
} EditMode;
|
||||
|
||||
#ifdef MYTIMANAGER_IMPLEMENTATION
|
||||
InputForm(textinput::Manager* manager, nw4r::lyt::MultiArcResourceAccessor* multiArc,
|
||||
const char* layoutName, EventObserver* event, const char* fontName)
|
||||
: textinput::InputForm(manager, multiArc, layoutName, event, fontName),
|
||||
unk_0x308(NULL), unk_0x30C(NULL), unk_0x310(NULL), unk_0x314(NULL),
|
||||
InputForm(Manager* manager, nw4r::lyt::MultiArcResourceAccessor* resAccessor, const char* arcName,
|
||||
EventObserver* observer, const char* subName)
|
||||
: textinput::InputForm(manager, resAccessor, arcName, observer, subName),
|
||||
mpMemoPane(NULL), mpMemoRootPane(NULL), mpBoundPane(NULL), mpDrawPane(NULL),
|
||||
mfScroll(0.0f), mfScrollFrom(0.0f), mfScrollTo(0.0f), mnLine(0),
|
||||
mDrawRect(), mDefaultDrawSize(), mDefaultBoundSize(), mExScrollAnm(),
|
||||
mDrawRect(0.0f, 0.0f, 0.0f, 0.0f), mDefaultDrawSize(0.0f, 0.0f), mDefaultBoundSize(0.0f, 0.0f),
|
||||
mpNigaoeObserver(NULL), mpDefaultNigaoe(NULL), mpSendString(NULL),
|
||||
mbEdited(false), mbGoodBye(false), mbEditScrollUp(false), mbEditScrollDown(false),
|
||||
mbCloseWithSend(false), mpScrollButton(NULL), mbScrollUp(false), mbScrollDown(false),
|
||||
meEditMode(EM_Disp) {}
|
||||
#endif
|
||||
mbEdited(false), mbGoodBye(false), mbEditScrollUp(false), mbEditScrollDown(false), mbCloseWithSend(false),
|
||||
mpScrollButton(NULL), mbScrollUp(false), mbScrollDown(false), meEditMode(EM_Disp) {}
|
||||
|
||||
~InputForm();
|
||||
#if defined(MYTIINPUTFORM_IMPLEMENTATION) || defined(MYTILETTERFORM_IMPLEMENTATION)
|
||||
virtual void moveCursorUp();
|
||||
virtual void moveCursorDown();
|
||||
virtual void onCommand(INPUT_COMMAND command, void* data);
|
||||
virtual void create(MEMAllocator* allocator, inputform::EditBuffer* editBuffer);
|
||||
virtual bool updateInput(int chan, f32 x, f32 y, u32 trig, u32 hold, u32 release, void* data);
|
||||
virtual bool updateInput(input::HKBManager& hkbManager);
|
||||
virtual void init();
|
||||
virtual void draw();
|
||||
virtual void calc();
|
||||
virtual void doScroll(Scroll* scroll);
|
||||
virtual u32 calcCursorPos(f32 x, f32 y);
|
||||
virtual void drawCursor(f32 x, f32 y);
|
||||
virtual nw4r::math::VEC2 getScale() const;
|
||||
virtual void preDraw(u32 pos);
|
||||
virtual void doLineFeed();
|
||||
virtual void finishDraw(u32 pos);
|
||||
virtual bool isInScroll();
|
||||
#endif
|
||||
|
||||
virtual void setScroll(f32 scroll);
|
||||
virtual void setAddScroll(f32 scroll, bool up, bool down);
|
||||
|
||||
virtual f32 getScroll() { return mfScroll; }
|
||||
#ifdef MYTIMANAGER_IMPLEMENTATION
|
||||
virtual f32 getScrollFrom();
|
||||
virtual f32 getScrollTo();
|
||||
#else
|
||||
virtual f32 getScroll() { return mfScroll; }
|
||||
virtual f32 getScrollFrom() { return mfScrollFrom; }
|
||||
virtual f32 getScrollTo() { return mfScrollTo; }
|
||||
#endif
|
||||
virtual f32 getScrollTo() { return mfScrollTo; }
|
||||
|
||||
virtual void open();
|
||||
virtual void close();
|
||||
@@ -100,7 +72,7 @@ namespace textinput {
|
||||
virtual void onArrowRTrig();
|
||||
virtual void onArrowLTrig();
|
||||
|
||||
virtual void setNigaoeEventObserver(NigaoeEventObserver* nigaoeObserver) { mpNigaoeObserver = nigaoeObserver; }
|
||||
virtual void setNigaoeEventObserver(NigaoeEventObserver* nigaoeObserver);
|
||||
virtual nw4r::lyt::Pane* getNigaoePane();
|
||||
virtual nw4r::lyt::Material* getNigaoePaneMaterial();
|
||||
|
||||
@@ -122,6 +94,33 @@ namespace textinput {
|
||||
virtual void onCommandOnEditMode(INPUT_COMMAND command, void* arg);
|
||||
|
||||
virtual void doAutoScroll();
|
||||
|
||||
#ifdef MYTIINPUTFORM_IMPLEMENTATION
|
||||
virtual void pure_0() = 0;
|
||||
virtual void pure_1() = 0;
|
||||
virtual void pure_2() = 0;
|
||||
virtual void pure_3() = 0;
|
||||
virtual void pure_4() = 0;
|
||||
virtual void pure_5() = 0;
|
||||
#endif
|
||||
|
||||
virtual void create(MEMAllocator* allocator, inputform::EditBuffer* editBuffer);
|
||||
virtual void moveCursorUp();
|
||||
virtual void moveCursorDown();
|
||||
virtual void onCommand(CommandReceiver::INPUT_COMMAND command, void* arg);
|
||||
virtual bool updateInput(int chan, f32 x, f32 y, u32 trig, u32 hold, u32 release, void* data);
|
||||
virtual bool updateInput(textinput::input::HKBManager& hkbManager);
|
||||
virtual void init();
|
||||
virtual void draw();
|
||||
virtual void calc();
|
||||
virtual void doScroll(CommandReceiver::Scroll* scroll);
|
||||
virtual u32 calcCursorPos(f32 x, f32 y);
|
||||
virtual void drawCursor(f32 x, f32 y);
|
||||
virtual nw4r::math::VEC2 getScale() const;
|
||||
virtual void preDraw(u32);
|
||||
virtual void doLineFeed();
|
||||
virtual void finishDraw(u32);
|
||||
virtual bool isInScroll();
|
||||
|
||||
/* For letter writing */
|
||||
|
||||
@@ -131,11 +130,7 @@ namespace textinput {
|
||||
void setEditScrollDown(bool editScrollDown) { mbEditScrollUp = editScrollDown; }
|
||||
void setCloseWithSend(bool closeWithSend) { mbCloseWithSend = closeWithSend; }
|
||||
|
||||
#if defined(MYTIMANAGER_IMPLEMENTATION) || defined(MYTIINPUTFORM_IMPLEMENTATION) || defined(MYTILETTERFORM_IMPLEMENTATION)
|
||||
void setEditMode(EditMode editMode);
|
||||
#else
|
||||
void setEditMode(EditMode editMode) { meEditMode = editMode; }
|
||||
#endif
|
||||
|
||||
bool isEdited() { return mbEdited; }
|
||||
bool isGoodBye() { return mbGoodBye; }
|
||||
@@ -147,24 +142,11 @@ namespace textinput {
|
||||
|
||||
tistring::Decolated* getSendString() { return mpSendString; }
|
||||
|
||||
#ifdef MYTILETTERFORM_IMPLEMENTATION
|
||||
protected:
|
||||
#else
|
||||
private:
|
||||
#endif
|
||||
#if defined(MYTIINPUTFORM_IMPLEMENTATION) || defined(MYTILETTERFORM_IMPLEMENTATION)
|
||||
nw4r::lyt::Pane* mpMemoPane;
|
||||
nw4r::lyt::Pane* mpMemoRootPane;
|
||||
nw4r::lyt::Pane* mpBoundPane;
|
||||
nw4r::lyt::Pane* mpDrawPane;
|
||||
#else
|
||||
#ifdef MYTIMANAGER_IMPLEMENTATION
|
||||
undefined4* unk_0x308;
|
||||
#endif
|
||||
undefined4* unk_0x30C;
|
||||
undefined4* unk_0x310;
|
||||
undefined4* unk_0x314;
|
||||
#endif
|
||||
nw4r::lyt::Pane* mpMemoPane; // 0x308
|
||||
nw4r::lyt::Pane* mpMemoRootPane; // 0x30C
|
||||
nw4r::lyt::Pane* mpBoundPane; // 0x310
|
||||
nw4r::lyt::Pane* mpDrawPane; // 0x314
|
||||
f32 mfScroll; // 0x318
|
||||
f32 mfScrollFrom; // 0x31C
|
||||
f32 mfScrollTo; // 0x320
|
||||
@@ -176,11 +158,7 @@ namespace textinput {
|
||||
nw4r::lyt::Size mDefaultBoundSize; // 0x358
|
||||
Mtx mDrawMtx; // 0x360
|
||||
Mtx mBoundMtx; // 0x390
|
||||
#if defined(MYTIMANAGER_IMPLEMENTATION) || defined(MYTIINPUTFORM_IMPLEMENTATION) || defined(MYTILETTERFORM_IMPLEMENTATION)
|
||||
util::Animation mExScrollAnm; // 0x3C0
|
||||
#else
|
||||
u8 /*todo*/ mExScrollAnm[32]; // 0x3C0
|
||||
#endif
|
||||
NigaoeEventObserver* mpNigaoeObserver; // 0x3E0
|
||||
GXTexObj* mpDefaultNigaoe; // 0x3E4
|
||||
tistring::Decolated* mpSendString; // 0x3E8
|
||||
@@ -190,13 +168,10 @@ namespace textinput {
|
||||
bool mbEditScrollDown; // 0x3EF
|
||||
bool mbCloseWithSend; // 0x3F0
|
||||
u8 padding[3]; // 0x3F1
|
||||
#if defined(MYTIINPUTFORM_IMPLEMENTATION) || defined(MYTILETTERFORM_IMPLEMENTATION)
|
||||
ScrollButton* mpScrollButton;
|
||||
#else
|
||||
undefined4* mpScrollButton;
|
||||
#endif
|
||||
ScrollButton* mpScrollButton; // 0x3F4
|
||||
bool mbScrollUp; // 0x3F8
|
||||
bool mbScrollDown; // 0x3F9
|
||||
u8 padding2[2]; // 0x3FA
|
||||
EditMode meEditMode; // 0x3FC
|
||||
};
|
||||
}
|
||||
|
||||
@@ -16,42 +16,36 @@ namespace textinput {
|
||||
T_Last,
|
||||
} Type;
|
||||
|
||||
#ifdef MYTIMANAGER_IMPLEMENTATION
|
||||
InputForm(textinput::Manager* manager, nw4r::lyt::MultiArcResourceAccessor* multiArc,
|
||||
const char* layoutName, EventObserver* event, const char* fontName)
|
||||
: textinput::MemoInputForm(manager, multiArc, layoutName, event, fontName),
|
||||
unk_0x400(0), mbPhotoDraw(false), meType(T_MailAddressSel) {}
|
||||
#endif
|
||||
InputForm(Manager* manager, nw4r::lyt::MultiArcResourceAccessor* resAccessor, const char* arcName,
|
||||
EventObserver* observer, const char* subName)
|
||||
: MemoInputForm(manager, resAccessor, arcName, observer, subName),
|
||||
mbPhotoScaledUp(false), mbPhotoDraw(false), meType(T_MailAddressSel) {}
|
||||
|
||||
~InputForm();
|
||||
|
||||
virtual void create(MEMAllocator* allocator, inputform::EditBuffer* editBuffer);
|
||||
virtual void drawBody();
|
||||
virtual void drawFooter();
|
||||
virtual void open();
|
||||
virtual void close();
|
||||
virtual bool isWholePaneInAnimation();
|
||||
|
||||
#ifdef MYTILETTERFORM_IMPLEMENTATION
|
||||
virtual ~InputForm();
|
||||
virtual void create(MEMAllocator*, inputform::EditBuffer*);
|
||||
virtual void drawBody();
|
||||
virtual void drawFooter();
|
||||
virtual void open();
|
||||
virtual void close();
|
||||
virtual bool isWholePaneInAnimation();
|
||||
#endif
|
||||
virtual nw4r::lyt::Material* getPhotoPaneMaterial();
|
||||
|
||||
virtual void onPhotoTrig();
|
||||
virtual void onPhotoPoint();
|
||||
virtual void onPhotoLeft();
|
||||
virtual bool isPhotoScaledUp();
|
||||
virtual void setPhotoDraw(bool photoDraw) { mbPhotoDraw = photoDraw; }
|
||||
virtual void setPhotoDraw(bool photoDraw);
|
||||
|
||||
virtual void setType(Type type) { meType = type; }
|
||||
virtual void setType(Type type);
|
||||
|
||||
virtual void setSendOutMessage(const wchar_t* sendOutMessage);
|
||||
|
||||
void resizePhotoPane(f32 width, f32 height);
|
||||
|
||||
private:
|
||||
#ifdef MYTILETTERFORM_IMPLEMENTATION
|
||||
bool mbPhotoScaledUp;
|
||||
#else
|
||||
u8 unk_0x400;
|
||||
#endif
|
||||
bool mbPhotoScaledUp; // 0x400
|
||||
bool mbPhotoDraw; // 0x401
|
||||
Type meType; // 0x404
|
||||
};
|
||||
|
||||
@@ -8,6 +8,10 @@
|
||||
|
||||
namespace textinput {
|
||||
namespace extend {
|
||||
namespace bg {
|
||||
class LayoutByNW4R;
|
||||
}
|
||||
|
||||
namespace memo {
|
||||
class State;
|
||||
|
||||
@@ -28,9 +32,7 @@ namespace textinput {
|
||||
CT_NumericWithSeparator,
|
||||
CT_NormalWithoutLineFeedWithSign,
|
||||
CT_PredictWithoutLineFeed,
|
||||
#ifdef MYTIMANAGER_IMPLEMENTATION
|
||||
CT_PredictBigText,
|
||||
#endif
|
||||
|
||||
CT_Last
|
||||
} ConfigType;
|
||||
@@ -81,35 +83,21 @@ namespace textinput {
|
||||
virtual void start();
|
||||
virtual void end();
|
||||
|
||||
#ifdef MYTIMANAGER_IMPLEMENTATION
|
||||
virtual textinput::InputForm* createInputForm();
|
||||
#else
|
||||
virtual InputForm* createInputForm();
|
||||
#endif
|
||||
virtual textinput::InputForm* createInputForm();
|
||||
|
||||
virtual void memoDraw();
|
||||
|
||||
virtual void setSaveData(savedata::MemoSetting memoSetting) {
|
||||
mMemoSetting = memoSetting;
|
||||
}
|
||||
virtual savedata::MemoSetting getSaveData() { return mMemoSetting; }
|
||||
virtual void setSaveData(savedata::MemoSetting memoSetting);
|
||||
virtual savedata::MemoSetting getSaveData();
|
||||
|
||||
virtual void changeState(StateTimeLine stateTimeLine);
|
||||
virtual State* getState() { return mpCurrentState; }
|
||||
virtual State* getState();
|
||||
virtual void setState(StateType stateType);
|
||||
|
||||
virtual ConfigType getConfigType() { return meConfigType; }
|
||||
virtual ConfigType getConfigType();
|
||||
|
||||
#ifdef MYTIMANAGER_IMPLEMENTATION
|
||||
virtual void setSaveData();
|
||||
#else
|
||||
virtual void setSaveData_();
|
||||
#endif
|
||||
virtual void reflectSaveData();
|
||||
#ifdef MYTIMANAGER_IMPLEMENTATION
|
||||
void reflectSaveDataRev1();
|
||||
void reflectSaveDataDefault();
|
||||
#endif
|
||||
|
||||
virtual void configDefault();
|
||||
virtual void configLetter();
|
||||
@@ -126,21 +114,24 @@ namespace textinput {
|
||||
virtual void configNormalWithoutLineFeedWithSign();
|
||||
virtual void configPredictWithoutLineFeed();
|
||||
virtual void configPredictBigText();
|
||||
#ifdef MYTIMANAGER_IMPLEMENTATION
|
||||
virtual textinput::MemoInputForm* createMemoInputForm();
|
||||
virtual textinput::LetterInputForm* createLetterInputForm();
|
||||
virtual textinput::InputForm* createBigTextInputForm();
|
||||
virtual void* createBG();
|
||||
#else
|
||||
virtual void createMemoInputForm();
|
||||
virtual void createLetterInputForm();
|
||||
virtual void createBigTextInputForm();
|
||||
virtual void createBG();
|
||||
#endif
|
||||
virtual InputForm* createMemoInputForm();
|
||||
virtual letter::InputForm* createLetterInputForm();
|
||||
virtual textinput::InputForm* createBigTextInputForm();
|
||||
virtual bg::LayoutByNW4R* createBG();
|
||||
|
||||
#ifdef MYTIMANAGER_IMPLEMENTATION
|
||||
void* getBackGround() const { return mpBackGround; }
|
||||
#endif
|
||||
virtual void pure_0() {}
|
||||
virtual void pure_1() {}
|
||||
virtual void pure_2() {}
|
||||
virtual void pure_3() {}
|
||||
virtual void pure_4() {}
|
||||
virtual void pure_5() {}
|
||||
virtual void pure_6() {}
|
||||
virtual void pure_7() {}
|
||||
virtual void pure_8() {}
|
||||
virtual void pure_9() {}
|
||||
|
||||
void reflectSaveDataRev1();
|
||||
void reflectSaveDataDefault();
|
||||
|
||||
private:
|
||||
State* mpCurrentState; // 0x40
|
||||
@@ -149,25 +140,22 @@ namespace textinput {
|
||||
MemoInputForm* mpMemoInputForm; // 0x50
|
||||
LetterInputForm* mpLetterInputForm; // 0x54
|
||||
textinput::InputForm* mpBigTextInputForm; // 0x58
|
||||
void* mpDefaultPCKeyboard; // 0x5C
|
||||
void* mpDefaultCellPhoneKeyboard; // 0x60
|
||||
keyboard::pctype::LayoutByNW4R* mpDefaultPCKeyboard; // 0x5C
|
||||
keyboard::cellphonetype::LayoutByNW4R* mpDefaultCellPhoneKeyboard; // 0x60
|
||||
textinput::InputForm* mpDefaultInputForm; // 0x64
|
||||
void* mpDefaultCandidateBox; // 0x68
|
||||
void* mpDefaultToolBar; // 0x6C
|
||||
void* mpDefaultPredictLanguageDialog; // 0x70
|
||||
void* mpDefaultSignWindow; // 0x74
|
||||
void* mpBackGround; // 0x78
|
||||
candidatebox::LayoutByNW4R* mpDefaultCandidateBox; // 0x68
|
||||
toolbar::LayoutByNW4R* mpDefaultToolBar; // 0x6C
|
||||
predictlang::LayoutByNW4R* mpDefaultPredictLanguageDialog; // 0x70
|
||||
keyboard::signwindow::LayoutByNW4R* mpDefaultSignWindow; // 0x74
|
||||
bg::LayoutByNW4R* mpBackGround; // 0x78
|
||||
|
||||
friend class State;
|
||||
};
|
||||
|
||||
class State {
|
||||
public:
|
||||
#ifdef MYTIMANAGER_IMPLEMENTATION
|
||||
State() : mpManager(NULL) {}
|
||||
Manager* getManager() const { return mpManager; }
|
||||
void setManager(Manager* manager) { mpManager = manager; }
|
||||
#endif
|
||||
virtual ~State();
|
||||
#ifdef MYTIMANAGER_MATCHING
|
||||
virtual Manager::StateType getStateType() = 0;
|
||||
|
||||
virtual void create() = 0;
|
||||
@@ -185,11 +173,49 @@ namespace textinput {
|
||||
virtual void start() = 0;
|
||||
virtual void end() = 0;
|
||||
|
||||
#else
|
||||
virtual InputForm* InputForm();
|
||||
virtual keyboard::hwkey::HWKeyboard* HWKeyboard();
|
||||
virtual keyboard::pctype::LayoutByNW4R* PCKeyboard();
|
||||
virtual keyboard::cellphonetype::LayoutByNW4R* CellPhoneKeyboard();
|
||||
virtual keyboard::signwindow::LayoutByNW4R* SignKeyboard();
|
||||
virtual candidatebox::LayoutByNW4R* CandidateBox();
|
||||
virtual toolbar::LayoutByNW4R* ToolBar();
|
||||
virtual predictlang::LayoutByNW4R* PredictLanguageSelectDialog();
|
||||
virtual bg::LayoutByNW4R* BG();
|
||||
|
||||
protected:
|
||||
Manager* mpManager; // 0x04
|
||||
|
||||
friend class Manager;
|
||||
};
|
||||
|
||||
class DispMemoState : public State {
|
||||
public:
|
||||
virtual ~DispMemoState();
|
||||
virtual Manager::StateType getStateType();
|
||||
|
||||
virtual void create();
|
||||
virtual void init();
|
||||
|
||||
virtual void draw();
|
||||
virtual void memoDraw();
|
||||
|
||||
virtual void calc();
|
||||
|
||||
virtual bool updateInput(int chan, f32 x, f32 y, u32 trig, u32 hold, u32 release);
|
||||
virtual bool updateInput(input::HKBManager& hkbManager);
|
||||
|
||||
virtual void start();
|
||||
virtual void end();
|
||||
};
|
||||
|
||||
class AppearMemoState : public State {
|
||||
public:
|
||||
AppearMemoState() : mfAnim(0.0f) {}
|
||||
virtual ~AppearMemoState();
|
||||
virtual Manager::StateType getStateType();
|
||||
|
||||
virtual void create();
|
||||
virtual void init();
|
||||
|
||||
virtual void draw();
|
||||
@@ -203,25 +229,44 @@ namespace textinput {
|
||||
virtual void start();
|
||||
virtual void end();
|
||||
|
||||
#endif
|
||||
#ifdef MYTIMANAGER_IMPLEMENTATION
|
||||
virtual InputForm* InputForm();
|
||||
virtual keyboard::hwkey::HWKeyboard* HWKeyboard();
|
||||
virtual keyboard::pctype::LayoutByNW4R* PCKeyboard();
|
||||
virtual keyboard::cellphonetype::LayoutByNW4R* CellPhoneKeyboard();
|
||||
virtual void* SignKeyboard();
|
||||
virtual candidatebox::LayoutByNW4R* CandidateBox();
|
||||
virtual toolbar::LayoutByNW4R* ToolBar();
|
||||
virtual void* PredictLanguageSelectDialog();
|
||||
virtual void* BG();
|
||||
#endif
|
||||
protected:
|
||||
f32 mfAnim; // 0x08
|
||||
};
|
||||
|
||||
private:
|
||||
Manager* mpManager; // 0x04
|
||||
class EditMemoState : public State {
|
||||
public:
|
||||
virtual ~EditMemoState();
|
||||
virtual Manager::StateType getStateType();
|
||||
|
||||
virtual void create();
|
||||
virtual void init();
|
||||
|
||||
virtual void draw();
|
||||
virtual void memoDraw();
|
||||
|
||||
virtual void calc();
|
||||
|
||||
virtual bool updateInput(int chan, f32 x, f32 y, u32 trig, u32 hold, u32 release);
|
||||
virtual bool updateInput(input::HKBManager& hkbManager);
|
||||
|
||||
virtual void start();
|
||||
virtual void end();
|
||||
};
|
||||
|
||||
class DisappearMemoState : public AppearMemoState {
|
||||
public:
|
||||
virtual ~DisappearMemoState();
|
||||
virtual Manager::StateType getStateType();
|
||||
|
||||
virtual void calc();
|
||||
|
||||
virtual void start();
|
||||
};
|
||||
}
|
||||
}
|
||||
typedef extend::memo::Manager MemoManager;
|
||||
}
|
||||
|
||||
#include "MyTiBg.h"
|
||||
|
||||
#endif // TEXTINPUT_MY_MANAGER_H
|
||||
|
||||
@@ -48,9 +48,6 @@ namespace textinput {
|
||||
|
||||
class CandidateBoxCaller {
|
||||
public:
|
||||
#ifdef TIINPUTFORM_IMPLEMENTATION
|
||||
CandidateBoxCaller() : mpCandidateBox(NULL) {}
|
||||
#endif
|
||||
// This candidate thing is a bit different from the dwarf
|
||||
class Candidates {
|
||||
public:
|
||||
@@ -77,9 +74,11 @@ namespace textinput {
|
||||
|
||||
class Base : public CommandSender {
|
||||
public:
|
||||
#ifdef TIMANAGER_IMPLEMENTATION
|
||||
Base(Manager* manager) : mpCandidates(NULL), mpAllocator(NULL), mbOn(false), mbInvalid(true), meLanguage(USA), mpManager(manager) {}
|
||||
#ifdef TI_CANDIDATEBOX_SAMPLE_CLASS
|
||||
Base(Manager* manager)
|
||||
: mpCandidates(NULL), mpAllocator(NULL), mbOn(false), mbInvalid(true), meLanguage(USA), mpManager(manager) {}
|
||||
#endif
|
||||
|
||||
virtual ~Base();
|
||||
virtual void create(MEMAllocator* allocator) override;
|
||||
virtual void init() override {}
|
||||
@@ -114,9 +113,8 @@ namespace textinput {
|
||||
|
||||
class EventHandler : public nw4rmanager::TiEventHandler {
|
||||
public:
|
||||
#ifdef TIMANAGER_IMPLEMENTATION
|
||||
EventHandler(LayoutByNW4R* layout) : mpLayoutByNW4R(layout) {}
|
||||
#endif
|
||||
|
||||
virtual void onTiEvent(gui::PaneComponent* paneComponent, u32 event, Input* input) override; // 0x18
|
||||
|
||||
LayoutByNW4R* mpLayoutByNW4R; // 0xC
|
||||
@@ -187,19 +185,7 @@ namespace textinput {
|
||||
void SetFocusedText(s32 pane) { mnFocusedIdx = pane; }
|
||||
s32 GetFocusedText() { return mnFocusedIdx; }
|
||||
f32 GetWidthScale_() const { return 608.0f / mfScreenWidth; }
|
||||
#ifdef TI_CANDIDATEBOX_IMPLEMENTATION
|
||||
f32 GetMargin_() const {
|
||||
f32 margin;
|
||||
if (mfScreenWidth > 700.0f) {
|
||||
margin = 10.0f;
|
||||
} else {
|
||||
margin = 20.0f;
|
||||
}
|
||||
return margin;
|
||||
}
|
||||
#else
|
||||
f32 GetMargin_() const { return mfScreenWidth > 700.0f ? 10.0f : 20.0f; }
|
||||
#endif
|
||||
s32 GetNextPageIdx_(s32 page) const;
|
||||
s32 GetPrevPageIdx_(s32 page) const;
|
||||
s32 GetDispNum() const;
|
||||
@@ -302,13 +288,13 @@ namespace textinput {
|
||||
// TODO
|
||||
class LayoutByNW4R : public Base, public nw4rmanager::Layout, public UIObj::Listener {
|
||||
public:
|
||||
#ifdef TIMANAGER_IMPLEMENTATION
|
||||
LayoutByNW4R(Manager* manager, nw4r::lyt::MultiArcResourceAccessor* accessor, EventObserver* observer, const char* layoutName)
|
||||
: Base(manager), nw4rmanager::Layout(accessor, layoutName, observer), mEventHandler(this), mpTiString(NULL),
|
||||
mTextArea(0, this, this), mLeftScroll(1, this, this), mRightScroll(2, this, this), mOnOffButton(3, this, this),
|
||||
mTextWindow(4, this, this), mbActive(true) {}
|
||||
const UIOnOffButton& getOnOffButton() const { return mOnOffButton; }
|
||||
#ifdef TI_CANDIDATEBOX_SAMPLE_CLASS
|
||||
LayoutByNW4R(Manager* manager, nw4r::lyt::MultiArcResourceAccessor* resAccessor, const char* arcName, EventObserver* observer)
|
||||
: Base(manager), nw4rmanager::Layout(resAccessor, arcName, observer), mEventHandler(this),
|
||||
mpTiString(NULL), mTextArea(0, this, this), mLeftScroll(1, this, this), mRightScroll(2, this, this),
|
||||
mOnOffButton(3, this, this), mTextWindow(4, this, this), mbActive(true) {}
|
||||
#endif
|
||||
|
||||
virtual ~LayoutByNW4R();
|
||||
virtual void create(MEMAllocator* allocator) override;
|
||||
virtual void init() override;
|
||||
@@ -337,11 +323,7 @@ namespace textinput {
|
||||
virtual u16 getScroll() { return mTextArea.GetDispOffset(); } // 0x100
|
||||
virtual bool isInScroll(); // 0x104
|
||||
virtual void setActive(bool active); // 0x108
|
||||
#ifdef TI_PC_KEYBOARD_IMPLEMENTATION
|
||||
virtual bool isActive() const { return mbActive; }
|
||||
#else
|
||||
virtual bool isActive() const;
|
||||
#endif // 0x10C
|
||||
virtual bool isActive() const; // 0x10C
|
||||
virtual void setSelectedTextPane(int pane) { mTextArea.SetSelectedText(pane); } // 0x110
|
||||
virtual void setFocusedTextPane(int pane) { mTextArea.SetFocusedText(pane); } // 0x114
|
||||
virtual int getFocusedTextPane() { return mTextArea.GetFocusedText(); } // 0x118
|
||||
@@ -351,13 +333,13 @@ namespace textinput {
|
||||
virtual void cancelStateFocusIn(); // 0x128
|
||||
virtual void onEvent(UIObj*, u32, void*) override; // 0x12C
|
||||
|
||||
#ifdef TIINPUTFORM_IMPLEMENTATION
|
||||
UITextArea& getTextArea() { return mTextArea; }
|
||||
#endif
|
||||
void onPressedShift(bool shift);
|
||||
void onReleasedShift();
|
||||
void startTurnOn(bool);
|
||||
|
||||
UIOnOffButton& getOnOffButton() { return mOnOffButton; }
|
||||
const UIOnOffButton& getOnOffButton() const { return mOnOffButton; }
|
||||
|
||||
private:
|
||||
void createAnmPane_(MEMAllocator* allocator);
|
||||
|
||||
@@ -420,6 +402,17 @@ namespace textinput {
|
||||
|
||||
virtual void onAnmEvent(AnmPaneEvent paneEvent) override; // 0x10
|
||||
};
|
||||
|
||||
#ifdef TI_CANDIDATEBOX_SAMPLE_CLASS
|
||||
class Sample : public LayoutByNW4R {
|
||||
public:
|
||||
Sample(Manager* manager, nw4r::lyt::MultiArcResourceAccessor* resAccessor, const char* arcName, EventObserver* observer)
|
||||
: LayoutByNW4R(manager, resAccessor, arcName, observer) {}
|
||||
virtual ~Sample();
|
||||
};
|
||||
#else
|
||||
class Sample {};
|
||||
#endif
|
||||
} // namespace candidatebox
|
||||
} // namespace textinput
|
||||
|
||||
|
||||
@@ -1,273 +1,226 @@
|
||||
#ifndef TEXTINPUT_CELL_PHONE_H
|
||||
#define TEXTINPUT_CELL_PHONE_H
|
||||
|
||||
#include "tiNw4rManager.h"
|
||||
#if defined(MYTIMANAGER_IMPLEMENTATION) || defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIHWKEYBOARD_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION)
|
||||
#include "tiKeyboard.h"
|
||||
#endif
|
||||
#include "tiNw4rManager.h"
|
||||
|
||||
#ifdef TI_CELLPHONE_IMPLEMENTATION
|
||||
#include <revolution/gx.h>
|
||||
#endif
|
||||
|
||||
namespace textinput {
|
||||
class Manager;
|
||||
#ifdef TI_CELLPHONE_SAMPLE_CLASS
|
||||
class EventObserver;
|
||||
#endif
|
||||
|
||||
namespace predictlang {
|
||||
class LayoutByNW4R;
|
||||
}
|
||||
|
||||
namespace keyboard {
|
||||
#ifdef TI_CELLPHONE_IMPLEMENTATION
|
||||
enum VKeyCode {
|
||||
VK_LINE_FEED = 0,
|
||||
VK_DELETE = 1,
|
||||
VK_SIGN_INPUT = 9,
|
||||
VK_PREDICT_LANGUAGE = 10,
|
||||
VK_INPUT_MODE_02 = 11,
|
||||
VK_INPUT_MODE_03 = 13,
|
||||
VK_INPUT_MODE_00 = 18,
|
||||
VK_INPUT_MODE_01 = 19,
|
||||
VK_TOGGLE_ABC_MODE = 23,
|
||||
};
|
||||
#endif
|
||||
namespace signwindow {
|
||||
class LayoutByNW4R;
|
||||
}
|
||||
}
|
||||
|
||||
namespace keyboard {
|
||||
class KeyboardBase;
|
||||
|
||||
typedef enum VKeyCode {
|
||||
VK_LF = 0,
|
||||
VK_DELETE = 1,
|
||||
VK_SPACE = 2,
|
||||
VK_OTHERS = 9,
|
||||
VK_PRDC = 0xA,
|
||||
VK_TAG_02 = 0xB,
|
||||
VK_TAG_03 = 0xD,
|
||||
VK_UNKNOWN_11 = 0x11,
|
||||
VK_TAG_00 = 0x12,
|
||||
VK_TAG_01 = 0x13,
|
||||
VK_SML_CPT = 0x17,
|
||||
VK_NONE = 0x1B,
|
||||
} VKeyCode;
|
||||
|
||||
namespace cellphonetype {
|
||||
class EventHandler;
|
||||
#ifdef TI_CELLPHONE_IMPLEMENTATION
|
||||
class CellPhoneAnmPane;
|
||||
struct PaneNameToCharCode;
|
||||
#endif
|
||||
#if defined(MYTIMANAGER_IMPLEMENTATION) || defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIHWKEYBOARD_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION)
|
||||
class Base : public textinput::keyboard::KeyboardBase {
|
||||
#else
|
||||
class Base {
|
||||
#endif
|
||||
struct KeySet;
|
||||
struct LanguageDependency;
|
||||
|
||||
class LayoutByNW4R;
|
||||
|
||||
class Base : public KeyboardBase {
|
||||
public:
|
||||
#if defined(MYTIMANAGER_IMPLEMENTATION) || defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIHWKEYBOARD_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION)
|
||||
#if defined(MYTIMANAGER_IMPLEMENTATION) && defined(TI_CELLPHONE_SAMPLE_CLASS)
|
||||
Base(Manager* manager) : mPreviousInputMode(0), mCurrentInputMode(0), mpManager(manager) {}
|
||||
#endif
|
||||
enum InputMode {
|
||||
typedef enum InputMode {
|
||||
IM_00,
|
||||
IM_01,
|
||||
IM_02,
|
||||
IM_03,
|
||||
IM_04,
|
||||
};
|
||||
IM_05,
|
||||
} InputMode;
|
||||
|
||||
virtual ~Base();
|
||||
virtual void create(MEMAllocator* allocator) override;
|
||||
virtual void init() override;
|
||||
virtual void updateFromReceiver(u32, void*) override;
|
||||
virtual void onKey(u32, void*) override;
|
||||
#ifdef TIMANAGER_IMPLEMENTATION
|
||||
#ifdef TI_CELLPHONE_SAMPLE_CLASS
|
||||
Base(Manager* manager) : mpManager(manager) {}
|
||||
#endif
|
||||
#if defined(TI_CELLPHONE_IMPLEMENTATION)
|
||||
virtual u32 getType() override;
|
||||
#elif defined(TI_PC_KEYBOARD_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION) || defined(TISIGNWINDOW_IMPLEMENTATION)
|
||||
virtual int getType() override;
|
||||
#elif defined(TIHWKEYBOARD_IMPLEMENTATION)
|
||||
virtual int getType() override;
|
||||
#else
|
||||
virtual void getType() override;
|
||||
#endif
|
||||
virtual void onActive() override;
|
||||
virtual void calc();
|
||||
virtual void draw();
|
||||
virtual InputMode getInputMode() const;
|
||||
virtual bool isLocked() const;
|
||||
virtual bool isNumeric() const;
|
||||
virtual bool isNumericWithDot() const;
|
||||
virtual bool isHoldingButton() const;
|
||||
virtual void doNumericMode(bool);
|
||||
virtual void changeInputMode(InputMode);
|
||||
virtual bool isUpperCase();
|
||||
virtual void setInputMode(InputMode);
|
||||
virtual void setUpperCaseJP(bool);
|
||||
virtual void setLangKeyActive(bool);
|
||||
virtual bool onClose();
|
||||
virtual void goSignInputMode();
|
||||
virtual void changePredictLanguage();
|
||||
virtual void setAbcMode(bool);
|
||||
virtual bool isZiActive();
|
||||
virtual bool isAtokActive();
|
||||
virtual void doInput();
|
||||
virtual void updateFixMode();
|
||||
#ifdef TI_CELLPHONE_IMPLEMENTATION
|
||||
wchar_t convertToZiCellphoneInput_(wchar_t value);
|
||||
#endif
|
||||
#else
|
||||
virtual void vt_0x08();
|
||||
virtual void vt_0x0C();
|
||||
virtual void vt_0x10();
|
||||
virtual void vt_0x14();
|
||||
virtual void vt_0x18();
|
||||
virtual void vt_0x1C();
|
||||
virtual void vt_0x20();
|
||||
virtual void vt_0x24();
|
||||
virtual void vt_0x28();
|
||||
virtual void vt_0x2C();
|
||||
virtual void vt_0x30();
|
||||
virtual void vt_0x34();
|
||||
virtual void vt_0x38();
|
||||
virtual void vt_0x3C();
|
||||
virtual void vt_0x40();
|
||||
virtual void vt_0x44();
|
||||
|
||||
virtual bool isNumeric() const;
|
||||
virtual void create(MEMAllocator* allocator) override; // 0x0C
|
||||
virtual void init() override; // 0x10
|
||||
virtual void setCommandReceiver(CommandReceiver* receiver) override; // 0x14
|
||||
virtual void sendCommand(u32, void*) override; // 0x18
|
||||
virtual void updateFromReceiver(u32, void*) override; // 0x1C
|
||||
virtual void onKey(u32, void*); // 0x20
|
||||
virtual int getType(); // 0x24
|
||||
virtual void setLanguage(Language language) override; // 0x28
|
||||
virtual Language getLanguage() const override; // 0x2C
|
||||
virtual void onActive() override; // 0x34
|
||||
virtual void calc(); // 0x38
|
||||
virtual void draw(); // 0x3C
|
||||
virtual int getInputMode() const; // 0x40
|
||||
virtual bool isLocked() const; // 0x44
|
||||
virtual bool isNumeric() const; // 0x48
|
||||
virtual bool isNumericWithDot() const; // 0x4C
|
||||
virtual bool isHoldingButton() const; // 0x50
|
||||
virtual void doNumericMode(bool); // 0x54
|
||||
virtual void changeInputMode(InputMode mode); // 0x58
|
||||
virtual bool isUpperCase(); // 0x5C
|
||||
virtual void setInputMode(InputMode mode); // 0x60
|
||||
virtual void setUpperCaseJP(bool); // 0x64
|
||||
virtual void setLangKeyActive(bool); // 0x68
|
||||
virtual void onClose(); // 0x6C
|
||||
virtual void goSignInputMode(); // 0x70
|
||||
virtual void changePredictLanguage(); // 0x74
|
||||
virtual void setAbcMode(bool); // 0x78
|
||||
virtual bool isZiActive(); // 0x7C
|
||||
virtual bool isAtokActive(); // 0x80
|
||||
virtual void doInput(); // 0x84
|
||||
virtual void updateFixMode(); // 0x88
|
||||
|
||||
virtual void vt_0x4C();
|
||||
virtual void vt_0x50();
|
||||
#if defined(MYTIMANAGER_IMPLEMENTATION) || defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIHWKEYBOARD_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION)
|
||||
virtual void doNumericMode(bool);
|
||||
#else
|
||||
virtual void vt_0x54();
|
||||
#endif
|
||||
virtual void vt_0x58();
|
||||
virtual void vt_0x5C();
|
||||
virtual void vt_0x60();
|
||||
virtual void vt_0x64();
|
||||
virtual void vt_0x68(bool);
|
||||
void onCtrlKey_(VKeyCode code);
|
||||
wchar_t convertToZiCellphoneInput_(wchar_t wc);
|
||||
|
||||
virtual bool onClose();
|
||||
#endif
|
||||
|
||||
// TODO enum?
|
||||
int getInputType() const;
|
||||
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIHWKEYBOARD_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION)
|
||||
void resetHoldingButton();
|
||||
#endif
|
||||
|
||||
#if defined(MYTIMANAGER_IMPLEMENTATION) || defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIHWKEYBOARD_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION)
|
||||
#if defined(MYTIMANAGER_IMPLEMENTATION) && defined(TI_CELLPHONE_IMPLEMENTATION)
|
||||
protected:
|
||||
#else
|
||||
private:
|
||||
#endif
|
||||
u32 mPreviousInputMode;
|
||||
u32 mCurrentInputMode;
|
||||
bool mbInputModeLocked;
|
||||
bool mbNumericMode;
|
||||
bool mbNumericWithDotMode;
|
||||
bool mbUpperCaseMode;
|
||||
bool mbAbcMode;
|
||||
bool mbLanguageKeyMode;
|
||||
#ifdef TI_CELLPHONE_IMPLEMENTATION
|
||||
const PaneNameToCharCode* mHoldingButton;
|
||||
#else
|
||||
u32 mHoldingButton;
|
||||
#endif
|
||||
void* mpInputModeTable;
|
||||
MEMAllocator* mpAllocator;
|
||||
#ifdef TI_CELLPHONE_IMPLEMENTATION
|
||||
Manager* mpManager;
|
||||
bool mInputState;
|
||||
#elif defined(TIMANAGER_IMPLEMENTATION)
|
||||
Manager* mpManager;
|
||||
u32 mInputState;
|
||||
#else
|
||||
void* mpInputSettings;
|
||||
u32 mInputState;
|
||||
#endif
|
||||
#ifdef TI_CELLPHONE_IMPLEMENTATION
|
||||
void onCtrlKey_(VKeyCode keyCode);
|
||||
#endif
|
||||
#endif
|
||||
Manager* mgr() { return mpManager; }
|
||||
|
||||
s32 mTapIndex; // 0x14
|
||||
s32 mInputMode; // 0x18
|
||||
u8 mbLocked; // 0x1C
|
||||
u8 mbNumeric; // 0x1D
|
||||
u8 mbNumericWithDot; // 0x1E
|
||||
u8 mbUpperCase; // 0x1F
|
||||
u8 mbShiftHeld; // 0x20
|
||||
u8 unk_0x21; // 0x21
|
||||
const PaneNameToCharCode* mpHoldingPane; // 0x24
|
||||
const LanguageDependency* mpLanguageDep; // 0x28
|
||||
MEMAllocator* mpAllocator; // 0x2C
|
||||
Manager* mpManager; // 0x30
|
||||
u8 mbLangKeyActive; // 0x34
|
||||
u8 unk_0x35[3]; // 0x35
|
||||
};
|
||||
|
||||
#ifndef TI_CELLPHONE_MATCH_LAYOUT
|
||||
#include "tiCellPhoneLayout.h"
|
||||
#else
|
||||
class LayoutByNW4R;
|
||||
#endif
|
||||
|
||||
#ifdef TI_CELLPHONE_IMPLEMENTATION
|
||||
enum Animation {
|
||||
ANM_Normal,
|
||||
ANM_FocusIn,
|
||||
ANM_FocusOut,
|
||||
ANM_RollOver,
|
||||
ANM_Pushed,
|
||||
ANM_05,
|
||||
ANM_06,
|
||||
ANM_ToggleOff,
|
||||
ANM_Last,
|
||||
};
|
||||
|
||||
enum KeyType {
|
||||
KT_NormalButton,
|
||||
KT_ControlButton,
|
||||
};
|
||||
|
||||
#ifdef TI_CELLPHONE_MATCH_LAYOUT
|
||||
class EventHandler : public nw4rmanager::TiEventHandler {
|
||||
public:
|
||||
EventHandler(LayoutByNW4R* layout) : mpLayoutByNW4R(layout) {}
|
||||
virtual ~EventHandler();
|
||||
virtual void onTiEvent(gui::PaneComponent* pane, u32 event, Input* input) override;
|
||||
EventHandler(LayoutByNW4R* layout) : mpLayout(layout) {}
|
||||
|
||||
virtual void onTiEvent(gui::PaneComponent* paneComponent, u32 event, TiEventHandler::Input* input); // 0x18
|
||||
|
||||
private:
|
||||
LayoutByNW4R* mpLayoutByNW4R;
|
||||
LayoutByNW4R* mpLayout; // 0x0C
|
||||
};
|
||||
#endif
|
||||
|
||||
class CellPhoneAnmPane : public nw4rmanager::AnmPane {
|
||||
public:
|
||||
CellPhoneAnmPane(nw4r::lyt::Pane* pane, nw4rmanager::AnmObserver* observer)
|
||||
#ifdef TI_CELLPHONE_MATCH_LAYOUT
|
||||
: nw4rmanager::AnmPane(pane, observer), meState(ANM_Normal), meKeyType(KT_NormalButton) {
|
||||
CellPhoneAnmPane(nw4r::lyt::Pane* pane, nw4rmanager::AnmObserver* observer, u32 keyType)
|
||||
: nw4rmanager::AnmPane(pane, observer) {
|
||||
mState = 0;
|
||||
mKeyType = keyType;
|
||||
init();
|
||||
changeAnimation(meState);
|
||||
changeAnimation(mState);
|
||||
}
|
||||
#else
|
||||
: nw4rmanager::AnmPane(pane, observer), meState(ANM_Normal), meKeyType(KT_NormalButton) {}
|
||||
#endif
|
||||
|
||||
virtual void init() override;
|
||||
virtual void onAnmEvent(AnmPaneEvent event) override;
|
||||
virtual void changeAnimation(u32 id) override;
|
||||
virtual KeyType getKeyType() const;
|
||||
u32 getAnimationState() const { return meState; }
|
||||
virtual ~CellPhoneAnmPane();
|
||||
virtual void init(); // 0x08
|
||||
virtual void onAnmEvent(AnmPaneEvent paneEvent); // 0x10
|
||||
virtual void changeAnimation(u32 id); // 0x14
|
||||
virtual u32 getKeyType() const; // 0x24
|
||||
|
||||
protected:
|
||||
Animation meState;
|
||||
KeyType meKeyType;
|
||||
s32 mState; // 0x2C
|
||||
u32 mKeyType; // 0x30
|
||||
};
|
||||
|
||||
class CellPhoneControlAnmPane : public CellPhoneAnmPane {
|
||||
public:
|
||||
CellPhoneControlAnmPane(nw4r::lyt::Pane* pane, nw4rmanager::AnmObserver* observer)
|
||||
: CellPhoneAnmPane(pane, observer) { meKeyType = KT_ControlButton; }
|
||||
CellPhoneControlAnmPane(nw4r::lyt::Pane* pane, nw4rmanager::AnmObserver* observer, u32 keyType)
|
||||
: CellPhoneAnmPane(pane, observer, 0) {
|
||||
mKeyType = keyType;
|
||||
}
|
||||
|
||||
virtual void onAnmEvent(AnmPaneEvent event) override;
|
||||
virtual ~CellPhoneControlAnmPane();
|
||||
virtual void onAnmEvent(AnmPaneEvent paneEvent); // 0x10
|
||||
};
|
||||
|
||||
#ifndef TI_CELLPHONE_MATCH_LAYOUT
|
||||
class EventHandler : public nw4rmanager::TiEventHandler {
|
||||
|
||||
class LayoutByNW4R : public Base, public nw4rmanager::Layout {
|
||||
public:
|
||||
EventHandler(LayoutByNW4R* layout) : mpLayoutByNW4R(layout) {}
|
||||
virtual ~EventHandler();
|
||||
virtual void onTiEvent(gui::PaneComponent* pane, u32 event, Input* input) override;
|
||||
#ifdef TI_CELLPHONE_SAMPLE_CLASS
|
||||
LayoutByNW4R(Manager* manager, nw4r::lyt::MultiArcResourceAccessor* resAccessor, const char* arcName, EventObserver* observer)
|
||||
: Base(manager), nw4rmanager::Layout(resAccessor, arcName, observer),
|
||||
mpEventHandler(NULL) {}
|
||||
#endif
|
||||
|
||||
virtual ~LayoutByNW4R();
|
||||
virtual void create(MEMAllocator* allocator) override;
|
||||
virtual void init() override;
|
||||
virtual void setCommandReceiver(CommandReceiver* receiver) override;
|
||||
virtual void updateFromReceiver(u32, void*) override;
|
||||
virtual void onKey(u32, void*) override;
|
||||
virtual void setLanguage(Language language) override;
|
||||
virtual void update() override;
|
||||
virtual void onActive() override;
|
||||
virtual void calc() override;
|
||||
virtual void draw() override;
|
||||
virtual void doNumericMode(bool) override;
|
||||
virtual void changeInputMode(InputMode mode) override;
|
||||
virtual void setInputMode(InputMode mode) override;
|
||||
virtual void setUpperCaseJP(bool) override;
|
||||
virtual void setLangKeyActive(bool) override;
|
||||
virtual void onClose() override;
|
||||
virtual void goSignInputMode() override;
|
||||
virtual void changePredictLanguage() override;
|
||||
virtual void setAbcMode(bool) override;
|
||||
|
||||
virtual void setPredictLanguageDialog(predictlang::LayoutByNW4R*); // 0x104
|
||||
virtual void setSignWindow(signwindow::LayoutByNW4R*); // 0x108
|
||||
virtual void doNumericWithDotMode(bool); // 0x10C
|
||||
virtual void setLineFeedButton(bool); // 0x110
|
||||
virtual void setPredictLanguageButton(bool); // 0x114
|
||||
virtual void setSignWindowButton(bool); // 0x118
|
||||
virtual bool updateInput(int chan, f32 x, f32 y, u32 trig, u32 hold, u32 release, void* data); // 0x11C
|
||||
virtual bool updateInput(textinput::input::HKBManager& hkbManager); // 0x120
|
||||
virtual nw4rmanager::AnmPane* getAnmPane(InputMode mode); // 0x124
|
||||
virtual void throwReleaseForAll(); // 0x128
|
||||
virtual void changeAnimationAllToNormal(); // 0x12C
|
||||
virtual void updatePredictLanguage(CommandReceiver::ChangePredictMode* mode); // 0x130
|
||||
virtual void changeKeyTop(const PaneNameToCharCode* table); // 0x134
|
||||
virtual void changeSpaceKeyTop(const PaneNameToCharCode* table); // 0x138
|
||||
|
||||
void onPressedShift(bool shift);
|
||||
void onReleasedShift();
|
||||
void resetHoldingButton();
|
||||
|
||||
private:
|
||||
LayoutByNW4R* mpLayoutByNW4R;
|
||||
bool mbLineFeed; // 0xE0
|
||||
u8 unk_0xE1[3]; // 0xE1
|
||||
GXTexObj mSpaceTexObjJP; // 0xE4
|
||||
GXTexObj mSpaceTexObjCN; // 0x104
|
||||
GXTexObj mSpaceTexObjKR; // 0x124
|
||||
EventHandler* mpEventHandler; // 0x144
|
||||
predictlang::LayoutByNW4R* mpPredictLanguageDialog; // 0x148
|
||||
signwindow::LayoutByNW4R* mpSignWindow; // 0x14C
|
||||
};
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
||||
#ifdef TI_CELLPHONE_MATCH_LAYOUT
|
||||
#include "tiCellPhoneLayout.h"
|
||||
#ifdef TI_CELLPHONE_SAMPLE_CLASS
|
||||
class Sample : public LayoutByNW4R {
|
||||
public:
|
||||
Sample(Manager* manager, nw4r::lyt::MultiArcResourceAccessor* resAccessor, const char* arcName, EventObserver* observer)
|
||||
: LayoutByNW4R(manager, resAccessor, arcName, observer) {}
|
||||
virtual ~Sample();
|
||||
};
|
||||
#else
|
||||
class Sample {};
|
||||
#endif
|
||||
|
||||
} // namespace cellphonetype
|
||||
|
||||
@@ -72,10 +72,10 @@ namespace textinput {
|
||||
|
||||
virtual ~EventHandler() {} // 0x08
|
||||
|
||||
virtual void onEvent(GUIComponent& comp, u32 event, void* data) {} // 0x0C
|
||||
virtual void onEvent(GUIComponent& comp, u32 event, void* data); // 0x0C
|
||||
|
||||
virtual void setLatestEventCtrlNo(int ctrlNo) { muLatestEventCtrlNo = ctrlNo; } // 0x10
|
||||
virtual int getLatestEventCtrlNo() { return muLatestEventCtrlNo; } // 0x14
|
||||
virtual void setLatestEventCtrlNo(int ctrlNo); // 0x10
|
||||
virtual int getLatestEventCtrlNo(); // 0x14
|
||||
|
||||
protected:
|
||||
int muLatestEventCtrlNo; // 0x04
|
||||
@@ -92,9 +92,6 @@ namespace textinput {
|
||||
EVENT_RELEASE
|
||||
};
|
||||
|
||||
#ifdef TIINPUTFORM_IMPLEMENTATION
|
||||
virtual void init();
|
||||
#else
|
||||
virtual void init() { // 0x10
|
||||
for (int i = 0; i < GUI_POINTS_MAX; i++) {
|
||||
mbPointed[i] = false;
|
||||
@@ -103,20 +100,19 @@ namespace textinput {
|
||||
mFlightDuration[i] = 0;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
GUIComponent(u32 id)
|
||||
: GUIInterface(), mbInitialize(false), mDraggingButton(0xFFFF), mID(id), mbTriggerTarget(false), mpManager(NULL), mpListener(NULL) {
|
||||
init();
|
||||
}
|
||||
virtual ~GUIComponent() {} // 0x08
|
||||
virtual ~GUIComponent(); // 0x08
|
||||
|
||||
virtual u32 getID() { return mID; } // 0x20
|
||||
virtual u32 getID(); // 0x20
|
||||
|
||||
virtual bool isPointed(int point) { return mbPointed[point]; } // 0x24
|
||||
virtual bool isDragging(int point) { return mbDragging[point]; } // 0x28
|
||||
virtual bool isPointed(int point); // 0x24
|
||||
virtual bool isDragging(int point); // 0x28
|
||||
|
||||
virtual void setPointed(int point, bool bEnable) { mbPointed[point] = bEnable; } // 0x2C
|
||||
virtual void setPointed(int point, bool bEnable); // 0x2C
|
||||
|
||||
void onEvent(u32 event, void* data) {
|
||||
if (mpListener) {
|
||||
@@ -124,39 +120,30 @@ namespace textinput {
|
||||
}
|
||||
}
|
||||
|
||||
virtual void onPointIn(int point) { mFlightDuration[point] = 0; } // 0x30
|
||||
virtual void onPointOut(int point) { mFlightDuration[point] = 0; } // 0x34
|
||||
virtual void onPointIn(int point); // 0x30
|
||||
virtual void onPointOut(int point); // 0x34
|
||||
|
||||
virtual void onDrag(f32 x, f32 y) {}
|
||||
virtual void onMove(int point, f32 x, f32 y) { mFlightDuration[point]++; } // 0x38
|
||||
virtual void onTrig(int point, u32 trig, Vec& dragPos) {
|
||||
if (trig & mDraggingButton) {
|
||||
mDraggingPos[point] = dragPos;
|
||||
mbDragging[point] = true;
|
||||
mFlightDuration[point] = 0;
|
||||
}
|
||||
}
|
||||
virtual void onDrag(f32 x, f32 y);
|
||||
virtual void onMove(int point, f32 x, f32 y); // 0x38
|
||||
virtual void onTrig(int point, u32 trig, Vec& dragPos);
|
||||
|
||||
virtual void setDraggingButton(u32 dragBtn) { mDraggingButton = dragBtn; } // 0x3C
|
||||
virtual void setDraggingButton(u32 dragBtn); // 0x3C
|
||||
|
||||
virtual u32 updatePointer(const GUIPointer& pointer) { return updatePointerImpl(pointer); } // 0x40
|
||||
virtual u32 updatePointer(int point, f32 x, f32 y, u32 trig, u32 hold, u32 release) { // 0x44
|
||||
GUIPointer pointer(point, x, y, hold, trig, release);
|
||||
return updatePointerImpl(pointer);
|
||||
}
|
||||
virtual u32 updatePointer(const GUIPointer& pointer); // 0x48
|
||||
virtual u32 updatePointer(int point, f32 x, f32 y, u32 trig, u32 hold, u32 release); // 0x4C
|
||||
|
||||
virtual bool isTriggerTarget() { return mbTriggerTarget; } // 0x48
|
||||
virtual void setTriggerTarget(bool bEnable) { mbTriggerTarget = bEnable; } // 0x4C
|
||||
virtual bool isTriggerTarget(); // 0x50
|
||||
virtual void setTriggerTarget(bool bEnable); // 0x54
|
||||
|
||||
void setParentManager(GUIManager* manager) { mpManager = manager; }
|
||||
GUIManager* getParentManager() { return mpManager; }
|
||||
|
||||
virtual bool isVisible() { return true; } // 0x50
|
||||
virtual bool isVisible(); // 0x58
|
||||
|
||||
virtual u16 getFlightDuration(int point) { return mFlightDuration[point]; } // 0x54
|
||||
virtual void setFlightDuration(int point, u16 flightDir) { mFlightDuration[point] = flightDir; } // 0x58
|
||||
virtual u16 getFlightDuration(int point); // 0x5C
|
||||
virtual void setFlightDuration(int point, u16 flightDir); // 0x60
|
||||
|
||||
virtual bool contain(f32 x, f32 y) = 0; // 0x5C
|
||||
virtual bool contain(f32 x, f32 y) = 0; // 0x64
|
||||
|
||||
void setListener(EventHandler* listener) { mpListener = listener; }
|
||||
|
||||
@@ -167,9 +154,9 @@ namespace textinput {
|
||||
|
||||
bool mbInitialize; // 0x04
|
||||
|
||||
bool mbPointed[GUI_POINTS_MAX]; // 0x08
|
||||
bool mbPointed[GUI_POINTS_MAX]; // 0x05
|
||||
|
||||
bool mbDragging[GUI_POINTS_MAX]; // 0x10
|
||||
bool mbDragging[GUI_POINTS_MAX]; // 0x0D
|
||||
Vec mDraggingPos[GUI_POINTS_MAX]; // 0x18
|
||||
int mDraggingButton; // 0x78
|
||||
|
||||
@@ -177,10 +164,10 @@ namespace textinput {
|
||||
|
||||
u16 mFlightDuration[GUI_POINTS_MAX]; // 0x80
|
||||
|
||||
bool mbTriggerTarget; // 0x8A
|
||||
bool mbTriggerTarget; // 0x90
|
||||
|
||||
GUIManager* mpManager; // 0x8C
|
||||
EventHandler* mpListener; // 0x90
|
||||
GUIManager* mpManager; // 0x94
|
||||
EventHandler* mpListener; // 0x98
|
||||
};
|
||||
|
||||
class GUIManager : public GUIInterface {
|
||||
@@ -200,27 +187,15 @@ namespace textinput {
|
||||
virtual GUIComponent* getComponent(u32 id); // 0x24
|
||||
virtual GUIComponent* getComponent(u32 id) const; // 0x28
|
||||
|
||||
virtual bool update(int point, const KPADStatus* kpad, f32, f32, void* data) { return false; } // 0x2C
|
||||
virtual bool update(int point, const KPADStatus* kpad, f32, f32, void* data); // 0x2C
|
||||
virtual bool update(int point, f32 x, f32 y, u32 trig, u32 hold, u32 release, void* data); // 0x30
|
||||
|
||||
virtual void onEvent(GUIComponent& comp, u32 event, int point, void* data) { // 0x34
|
||||
if (mpEventHandler) {
|
||||
mpEventHandler->setLatestEventCtrlNo(point);
|
||||
mpEventHandler->onEvent(comp, event, data);
|
||||
}
|
||||
comp.onEvent(event, data);
|
||||
}
|
||||
virtual void onEvent(GUIComponent& comp, u32 event, int point, void* data); // 0x34
|
||||
|
||||
virtual void setAllComponentTriggerTarget(bool bEnable); // 0x38
|
||||
|
||||
virtual void setEventHandler(EventHandler* eventHandler) { // 0x3C
|
||||
mpEventHandler = eventHandler;
|
||||
}
|
||||
virtual EventHandler* changeEventHandler(EventHandler* eventHandler) { // 0x40
|
||||
EventHandler* prevHandler = mpEventHandler;
|
||||
mpEventHandler = eventHandler;
|
||||
return prevHandler;
|
||||
}
|
||||
virtual void setEventHandler(EventHandler* eventHandler); // 0x3C
|
||||
virtual EventHandler* changeEventHandler(EventHandler* eventHandler); // 0x40
|
||||
|
||||
virtual void setDraggingButton(u32 dragBtn); // 0x44
|
||||
|
||||
@@ -259,7 +234,7 @@ namespace textinput {
|
||||
|
||||
virtual PaneComponent* getPaneComponentByPane(nw4r::lyt::Pane* pane); // 0x4C
|
||||
|
||||
virtual const nw4r::lyt::DrawInfo* getDrawInfo() { return mpDrawInfo; } // 0x50
|
||||
virtual const nw4r::lyt::DrawInfo* getDrawInfo(); // 0x50
|
||||
virtual void setDrawInfo(const nw4r::lyt::DrawInfo* drawInfo) { mpDrawInfo = drawInfo; } // 0x54
|
||||
|
||||
virtual void setAllBoundingBoxComponentTriggerTarget(bool bEnable); // 0x58
|
||||
@@ -298,11 +273,11 @@ namespace textinput {
|
||||
|
||||
virtual void draw(); // 0x1C
|
||||
|
||||
virtual bool isVisible(); // 0x50
|
||||
virtual bool isVisible(); // 0x58
|
||||
|
||||
virtual bool contain(f32 x, f32 y); // 0x5C
|
||||
virtual bool contain(f32 x, f32 y); // 0x64
|
||||
|
||||
virtual void setPane(nw4r::lyt::Pane* pane) { mpPane = pane; } // 0x60
|
||||
virtual void setPane(nw4r::lyt::Pane* pane); // 0x68
|
||||
nw4r::lyt::Pane* getPane() { return mpPane; }
|
||||
|
||||
nw4r::lyt::TextBox* getTextPane() { return static_cast<nw4r::lyt::TextBox*>(mpPane); }
|
||||
|
||||
@@ -4,232 +4,158 @@
|
||||
#include <revolution/types.h>
|
||||
|
||||
#include <revolution/mem/allocator.h>
|
||||
#include <revolution/os.h>
|
||||
|
||||
#include "keyboard/tiCpData.h"
|
||||
#ifdef TIHKBMANAGER_IMPLEMENTATION
|
||||
#include <revolution/kbd.h>
|
||||
enum _KBDEc { KBD_EC_BUSY = 7 };
|
||||
#endif
|
||||
|
||||
typedef enum _KBDEc {
|
||||
KBD_EC_0 = 0,
|
||||
KBD_EC_1,
|
||||
KBD_EC_2,
|
||||
KBD_EC_3,
|
||||
KBD_EC_4,
|
||||
KBD_EC_5,
|
||||
KBD_EC_6,
|
||||
KBD_EC_OK,
|
||||
} KBDEc;
|
||||
|
||||
typedef struct _KBDDevEvent {
|
||||
u8 chan;
|
||||
u8 unk_0x01[0x1F];
|
||||
} KBDDevEvent;
|
||||
|
||||
typedef struct _KBDKeyEvent {
|
||||
u8 chan;
|
||||
u8 key;
|
||||
u8 unk_0x02[2];
|
||||
u32 mods;
|
||||
} KBDKeyEvent;
|
||||
|
||||
extern "C" {
|
||||
void KBDInitRegionUS(void);
|
||||
void KBDInit(void);
|
||||
void KBDSetAttachCallback(void (*cb)(KBDDevEvent*));
|
||||
void KBDSetDetachCallback(void (*cb)(KBDDevEvent*));
|
||||
void KBDSetKeyCallback(void (*cb)(KBDKeyEvent*));
|
||||
int KBDSetLedsAsync(u8 chan, u8 leds, void (*cb)(KBDEc, void*), void* arg);
|
||||
int KBDSetLeds(u8 chan, u8 leds);
|
||||
int KBDSetModState(u8 chan, u32 mods);
|
||||
int KBDSetCountry(u8 chan, u32 country);
|
||||
int KBDSetLockProcessing(u8 chan, int lock);
|
||||
u16 KBDTranslateHidCode(u8 key, u32 country);
|
||||
}
|
||||
|
||||
namespace textinput {
|
||||
namespace input {
|
||||
#ifdef TIHKBMANAGER_IMPLEMENTATION
|
||||
|
||||
class HKBManager {
|
||||
public:
|
||||
class KeyState_ {
|
||||
public:
|
||||
void NotifyEvent(u8 down, u8 code);
|
||||
void Update();
|
||||
void UpdateModState_();
|
||||
void Clear() {
|
||||
held = 0;
|
||||
triggered = 0;
|
||||
released = 0;
|
||||
repeated = 0;
|
||||
current = 0;
|
||||
pending = 0;
|
||||
modifiers &= 0x700;
|
||||
forceMask = 0;
|
||||
forceState = 0;
|
||||
retryLeds = 0;
|
||||
}
|
||||
void Initialize(u8 channel) {
|
||||
held = 0;
|
||||
triggered = 0;
|
||||
released = 0;
|
||||
repeated = 0;
|
||||
current = 0;
|
||||
pending = 0;
|
||||
forceMask = 0;
|
||||
forceState = 0;
|
||||
retryLeds = 0;
|
||||
device = channel;
|
||||
country = 0xf;
|
||||
modifiers = 0;
|
||||
}
|
||||
u8 device;
|
||||
u32 held, triggered, released, repeated;
|
||||
u32 previous, current, pending;
|
||||
u32 modifiers, forceState, forceMask;
|
||||
s32 country;
|
||||
u8 retryLeds;
|
||||
u8 previousKeys[8], currentKeys[8], pendingKeys[8];
|
||||
u32 repeatDelay[8];
|
||||
};
|
||||
HKBManager();
|
||||
~HKBManager();
|
||||
|
||||
static HKBManager& getInstance() { return sInstance; }
|
||||
|
||||
void Initialize();
|
||||
void Update();
|
||||
|
||||
u32 GetModifierState() const;
|
||||
void SetModifierState(u32 state, u32 mask);
|
||||
void SetForceModifierState(u32 state, u32 mask);
|
||||
void SetCountry(u8 country);
|
||||
void ClearState();
|
||||
|
||||
class KeySet {
|
||||
public:
|
||||
KeySet() {}
|
||||
KeySet(const HKBManager* owner, u8 kind)
|
||||
: manager(owner), type(kind), index(-1), device(0), vcode(0) {}
|
||||
u8 GetKey() const;
|
||||
u32 GetWChar() const;
|
||||
u32 GetVCode() const;
|
||||
u32 IsValid() const;
|
||||
bool CheckValidity() const {
|
||||
if (!manager) return false;
|
||||
s8 keyIndex = index;
|
||||
if (keyIndex < 0 || keyIndex >= 8) return false;
|
||||
u8 keyDevice = device;
|
||||
if (keyDevice >= 2) return false;
|
||||
switch (type) {
|
||||
case 0: return (manager->states[keyDevice].held & (1 << keyIndex)) != 0;
|
||||
case 1: return (manager->states[keyDevice].triggered & (1 << keyIndex)) != 0;
|
||||
case 2: return (manager->states[keyDevice].released & (1 << keyIndex)) != 0;
|
||||
case 3: return (manager->states[keyDevice].repeated & (1 << keyIndex)) != 0;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
KeySet GetNext() const;
|
||||
const HKBManager* manager;
|
||||
u8 type;
|
||||
s8 index;
|
||||
u8 device;
|
||||
mutable u16 vcode;
|
||||
KeySet(const HKBManager* manager, u8 type) :
|
||||
mpManager(manager), mType(type),
|
||||
mIndex(-1), mSubIndex(0), mVCode(0) {}
|
||||
|
||||
u8 GetKey() const;
|
||||
wchar_t GetWChar() const;
|
||||
wchar_t GetVCode() const;
|
||||
bool IsValid() const;
|
||||
KeySet GetNext() const;
|
||||
|
||||
const HKBManager* mpManager; // 0x00
|
||||
u8 mType; // 0x04
|
||||
s8 mIndex; // 0x05
|
||||
u8 mSubIndex; // 0x06
|
||||
mutable u16 mVCode; // 0x08
|
||||
};
|
||||
class KBDListenerOwn;
|
||||
class KBDListenerLinks {
|
||||
|
||||
KeySet GetTriggeredKeySet() const;
|
||||
KeySet GetReleasedKeySet() const;
|
||||
KeySet GetRepeatedKeySet() const;
|
||||
|
||||
private:
|
||||
class KeyState_ {
|
||||
public:
|
||||
KBDListenerLinks() : previous(0), next(0) {}
|
||||
virtual ~KBDListenerLinks() {}
|
||||
virtual void OnAttach(KBDDevEvent*) = 0;
|
||||
virtual void OnDetach(KBDDevEvent*) = 0;
|
||||
virtual void OnKeyEvent(KBDKeyEvent*) = 0;
|
||||
KBDListenerOwn* previous;
|
||||
KBDListenerOwn* next;
|
||||
void NotifyEvent(u8 type, u8 key);
|
||||
void Update();
|
||||
void UpdateModState_();
|
||||
|
||||
u8 mKbdChan; // 0x00
|
||||
u8 pad_0x01[3];
|
||||
u32 mMaskWork; // 0x04
|
||||
u32 mTrigMask; // 0x08
|
||||
u32 mRelMask; // 0x0C
|
||||
u32 mRepMask; // 0x10
|
||||
u32 mPrevMask; // 0x14
|
||||
u32 mCurMask; // 0x18
|
||||
u32 mInputMask; // 0x1C
|
||||
u32 mModState; // 0x20
|
||||
u32 mForceMod; // 0x24
|
||||
u32 mForceMask; // 0x28
|
||||
s32 mCountry; // 0x2C
|
||||
u8 mLedOK; // 0x30
|
||||
u8 mReleasedKeys[8]; // 0x31
|
||||
u8 mPrevKeys[8]; // 0x39
|
||||
u8 mCurKeys[8]; // 0x41
|
||||
u8 pad_0x49[3];
|
||||
u32 mRepeatCtr[8]; // 0x4C
|
||||
};
|
||||
class KBDListenerOwn : public KBDListenerLinks {
|
||||
|
||||
class KBDListener {
|
||||
public:
|
||||
KBDListenerOwn(HKBManager* owner) : manager(owner) {}
|
||||
virtual ~KBDListenerOwn();
|
||||
KBDListener() : unk_0x04(0), mpNext(NULL) {}
|
||||
virtual ~KBDListener() {}
|
||||
virtual void OnAttach(KBDDevEvent* event);
|
||||
virtual void OnDetach(KBDDevEvent* event);
|
||||
virtual void OnKeyEvent(KBDKeyEvent* event);
|
||||
HKBManager* manager;
|
||||
|
||||
u32 unk_0x04;
|
||||
KBDListener* mpNext;
|
||||
};
|
||||
HKBManager() __attribute__((never_inline));
|
||||
~HKBManager();
|
||||
static HKBManager& getInstance() { return sInstance; }
|
||||
void Initialize();
|
||||
void ClearState();
|
||||
u32 GetModifierState() const;
|
||||
void SetCountry(u8 country);
|
||||
void SetModifierState(u32 state, u32 mask);
|
||||
void SetForceModifierState(u32 state, u32 mask);
|
||||
void Update();
|
||||
KeySet GetTriggeredKeySet() const;
|
||||
KeySet GetReleasedKeySet() const;
|
||||
KeySet GetRepeatedKeySet() const;
|
||||
#ifdef TIHWKEYBOARD_IMPLEMENTATION
|
||||
KeySet GetReleasedKeySet() const;
|
||||
#endif
|
||||
static void SetLedCB(_KBDEc result, void* userData);
|
||||
|
||||
class KBDListenerOwn : public KBDListener {
|
||||
public:
|
||||
KBDListenerOwn(HKBManager* manager) : mpManager(manager) {}
|
||||
|
||||
virtual void OnAttach(KBDDevEvent* event);
|
||||
virtual void OnDetach(KBDDevEvent* event);
|
||||
virtual void OnKeyEvent(KBDKeyEvent* event);
|
||||
|
||||
HKBManager* mpManager; // 0x0C
|
||||
};
|
||||
|
||||
static void SetLedCB(KBDEc result, void* arg);
|
||||
static void AttachCB(KBDDevEvent* event);
|
||||
static void DetachCB(KBDDevEvent* event);
|
||||
static void KeyEventCB(KBDKeyEvent* event);
|
||||
private:
|
||||
u8 initialized;
|
||||
u8 attached[2];
|
||||
u32 lockState;
|
||||
u32 retryDevices;
|
||||
const wchar_t* allowedCharacters;
|
||||
u32 allowedCharacterCount;
|
||||
KeyState_ states[2];
|
||||
KBDListenerOwn listener;
|
||||
static HKBManager sInstance;
|
||||
};
|
||||
#else
|
||||
class HKBManager {
|
||||
public:
|
||||
#ifdef TIMANAGER_IMPLEMENTATION
|
||||
void ClearState();
|
||||
#endif
|
||||
static HKBManager& getInstance() { return sInstance; }
|
||||
|
||||
void Initialize();
|
||||
void Update();
|
||||
|
||||
u32 GetModifierState() const;
|
||||
void SetModifierState(u32, u32);
|
||||
|
||||
#if defined(TI_CELLPHONE_HKB_KEYSET)
|
||||
class KeySet {
|
||||
public:
|
||||
u8 GetKey() const;
|
||||
u32 GetWChar() const;
|
||||
bool IsValid() const;
|
||||
KeySet GetNext() const;
|
||||
KeySet(const KeySet& other)
|
||||
: mpManager(other.mpManager), mKind(other.mKind), mIndex(other.mIndex),
|
||||
mDevice(other.mDevice), mCharacter(other.mCharacter) {}
|
||||
private:
|
||||
const HKBManager* mpManager;
|
||||
u8 mKind;
|
||||
s8 mIndex;
|
||||
u8 mDevice;
|
||||
u16 mCharacter;
|
||||
};
|
||||
KeySet GetTriggeredKeySet() const;
|
||||
KeySet GetRepeatedKeySet() const;
|
||||
#else
|
||||
#if defined(TI_PC_KEYBOARD_IMPLEMENTATION) || defined(TISIGNWINDOW_IMPLEMENTATION) || defined(TIHWKEYBOARD_IMPLEMENTATION)
|
||||
class KeySet {
|
||||
public:
|
||||
u8 GetKey() const;
|
||||
#ifdef TIHWKEYBOARD_IMPLEMENTATION
|
||||
u32 GetWChar() const;
|
||||
#else
|
||||
wchar_t GetWChar() const;
|
||||
#endif
|
||||
bool IsValid() const;
|
||||
KeySet GetNext() const;
|
||||
KeySet(const KeySet& other)
|
||||
: mpManager(other.mpManager), mKind(other.mKind), mIndex(other.mIndex), mDevice(other.mDevice), mCharacter(other.mCharacter) {}
|
||||
#ifdef TIHWKEYBOARD_IMPLEMENTATION
|
||||
KeySet() : mpManager(NULL), mKind(0), mIndex(-1), mDevice(0), mCharacter(0) {}
|
||||
#endif
|
||||
private:
|
||||
const HKBManager* mpManager;
|
||||
u8 mKind;
|
||||
s8 mIndex;
|
||||
u8 mDevice;
|
||||
u16 mCharacter;
|
||||
};
|
||||
KeySet GetTriggeredKeySet() const;
|
||||
KeySet GetRepeatedKeySet() const;
|
||||
#ifdef TIHWKEYBOARD_IMPLEMENTATION
|
||||
KeySet GetReleasedKeySet() const;
|
||||
#endif
|
||||
void SetForceModifierState(u32 mask, u32 state);
|
||||
#else
|
||||
class KeySet {
|
||||
private:
|
||||
keyboard::cellphonetype::PaneNameToCharCode* pPaneNameToCharCode; // 0x00
|
||||
wchar_t szKeySetName[17]; // 0x04
|
||||
u16 uNum; // 0x26
|
||||
u16 uType; // 0x28
|
||||
|
||||
#ifdef TI_CELLPHONE_IMPLEMENTATION
|
||||
public:
|
||||
bool IsValid() const;
|
||||
u32 GetKey() const;
|
||||
wchar_t GetWChar() const;
|
||||
KeySet GetNext() const;
|
||||
#endif
|
||||
};
|
||||
|
||||
#ifdef TI_CELLPHONE_IMPLEMENTATION
|
||||
KeySet GetTriggeredKeySet() const;
|
||||
KeySet GetRepeatedKeySet() const;
|
||||
#endif
|
||||
|
||||
#endif
|
||||
#endif
|
||||
private:
|
||||
u8 unk_0x00[0xFC];
|
||||
u8 mInitialized; // 0x00
|
||||
u8 mAttached[2]; // 0x01
|
||||
u8 pad_0x03;
|
||||
u32 mModState; // 0x04
|
||||
u32 mPendingLeds; // 0x08
|
||||
const wchar_t* mpKeyTable; // 0x0C
|
||||
u32 mKeyTableNum; // 0x10
|
||||
KeyState_ mKeyStates[2]; // 0x14
|
||||
KBDListenerOwn mListener; // 0xEC
|
||||
|
||||
static HKBManager sInstance;
|
||||
};
|
||||
#endif
|
||||
|
||||
} // namespace input
|
||||
} // namespace textinput
|
||||
|
||||
|
||||
@@ -8,62 +8,39 @@ namespace textinput {
|
||||
class Manager;
|
||||
namespace keyboard {
|
||||
namespace hwkey {
|
||||
#ifdef TIMANAGER_IMPLEMENTATION
|
||||
class HWKeyboard : public CommandSender {
|
||||
#else
|
||||
class HWKeyboard : CommandSender {
|
||||
#endif
|
||||
public:
|
||||
struct AnimationFile {
|
||||
u32 mAnimationNo;
|
||||
char mFileName[0x40];
|
||||
};
|
||||
static const AnimationFile csAninationFile[8];
|
||||
|
||||
HWKeyboard(Manager *);
|
||||
#ifdef TIMANAGER_IMPLEMENTATION
|
||||
inline ~HWKeyboard();
|
||||
#else
|
||||
~HWKeyboard();
|
||||
#endif
|
||||
#ifdef TIMANAGER_IMPLEMENTATION
|
||||
void setLanguage(Destination destination, Language language);
|
||||
#endif
|
||||
|
||||
virtual void init();
|
||||
#if defined(TI_PC_KEYBOARD_IMPLEMENTATION) || defined(TIHWKEYBOARD_IMPLEMENTATION)
|
||||
wchar_t convertWCCode(wchar_t code) const;
|
||||
#endif
|
||||
virtual ~HWKeyboard();
|
||||
|
||||
#if defined(MYTIMANAGER_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION)
|
||||
void updateInput(int chan, f32 x, f32 y, u32 trig, u32 hold, u32 release, void* data);
|
||||
#else
|
||||
virtual void updateInput(int chan, f32 x, f32 y, u32 trig, u32 hold, u32 release, void* data);
|
||||
#endif
|
||||
virtual bool updateInput(input::HKBManager& hkbManager);
|
||||
|
||||
#ifdef TIINPUTFORM_IMPLEMENTATION
|
||||
void resetQuoteState() { mbSingleQuoteClosing = 0; mbDoubleQuoteClosing = 0; }
|
||||
#endif
|
||||
private:
|
||||
#ifdef TIHWKEYBOARD_IMPLEMENTATION
|
||||
bool updateRepeatKey_(input::HKBManager&);
|
||||
bool updateTriggerKey_(input::HKBManager&);
|
||||
bool updateTappingShift_(input::HKBManager&);
|
||||
#endif
|
||||
void updateShift(input::HKBManager& hkbManager);
|
||||
bool updateRepeatKey_(input::HKBManager& hkbManager);
|
||||
bool updateTriggerKey_(input::HKBManager& hkbManager);
|
||||
bool updateTappingShift_(input::HKBManager& hkbManager);
|
||||
public:
|
||||
u16 convertWCCode(wchar_t wc) const;
|
||||
void setLanguage(Destination destination, Language language);
|
||||
private:
|
||||
void controlKeyTriggeredHandler(input::HKBManager);
|
||||
|
||||
Manager *mgr() { return mpManager; }
|
||||
|
||||
Manager* mpManager; // 0x10
|
||||
u8 field_0x14; // 0x14
|
||||
#ifdef TIINPUTFORM_IMPLEMENTATION
|
||||
u8 mbSingleQuoteClosing;
|
||||
u8 mbDoubleQuoteClosing;
|
||||
#else
|
||||
#ifdef TIHWKEYBOARD_IMPLEMENTATION
|
||||
bool field_0x15;
|
||||
bool field_0x16;
|
||||
#else
|
||||
u8 field_0x15; // 0x15
|
||||
u8 field_0x16; // 0x16
|
||||
#endif
|
||||
#endif
|
||||
bool field_0x15; // 0x15
|
||||
bool field_0x16; // 0x16
|
||||
};
|
||||
|
||||
|
||||
|
||||
@@ -13,43 +13,17 @@
|
||||
#include "tiZiString.h"
|
||||
#include "tiSEId.h"
|
||||
|
||||
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION)
|
||||
extern "C" wchar_t KPRGetChar(KPRQueue* queue);
|
||||
extern "C" void KPRPutChar(KPRQueue* queue, wchar_t character);
|
||||
extern "C" void KPRClearQueue(KPRQueue* queue);
|
||||
extern "C" void KPRInitRegionUS();
|
||||
extern "C" u8 KPRLookAhead(KPRQueue* queue, wchar_t* character, wchar_t* combining);
|
||||
#endif
|
||||
|
||||
namespace textinput {
|
||||
#ifdef TIMANAGER_IMPLEMENTATION
|
||||
class Manager;
|
||||
#endif
|
||||
namespace inputform {
|
||||
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION)
|
||||
class Base;
|
||||
class EventHandler;
|
||||
class LayoutByNW4R;
|
||||
#endif
|
||||
class EditBuffer {
|
||||
#ifdef TIMANAGER_IMPLEMENTATION
|
||||
friend class textinput::Manager;
|
||||
public:
|
||||
EditBuffer() : mpString(NULL), mpUnfixString(NULL), mpZiString(NULL), mpAllocator(NULL) {}
|
||||
#endif
|
||||
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION)
|
||||
friend class LayoutByNW4R;
|
||||
friend class Base;
|
||||
#endif
|
||||
public:
|
||||
#if defined(MYTIMANAGER_IMPLEMENTATION) || defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION)
|
||||
void create(MEMAllocator* allocator);
|
||||
#endif
|
||||
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION)
|
||||
EditBuffer() : mpString(NULL), mpUnfixString(NULL), mpZiString(NULL), mpAllocator(NULL) {}
|
||||
|
||||
virtual ~EditBuffer();
|
||||
#else
|
||||
~EditBuffer();
|
||||
#endif
|
||||
virtual void create(MEMAllocator* allocator);
|
||||
|
||||
void* getString() const { return mpString; }
|
||||
void* getZiString() const { return mpZiString; }
|
||||
|
||||
private:
|
||||
void* mpString; // 0x04
|
||||
@@ -59,27 +33,10 @@ namespace textinput {
|
||||
};
|
||||
|
||||
class DeadKeyStream {
|
||||
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION)
|
||||
public:
|
||||
DeadKeyStream() { KPRInitRegionUS(); init(); }
|
||||
static wchar_t ToCombineClass(Language language, wchar_t code);
|
||||
static wchar_t ToIndependentClass(wchar_t code);
|
||||
inline wchar_t getChar();
|
||||
void init();
|
||||
u8 lookAhead() { return KPRLookAhead(&mKPRQueue, NULL, NULL); }
|
||||
void putChar(wchar_t character) { KPRPutChar(&mKPRQueue, character); }
|
||||
bool isEmpty() const { return mKPRQueue.oCount == 0; }
|
||||
void clear() { KPRClearQueue(&mKPRQueue); }
|
||||
private:
|
||||
#ifdef TIMANAGER_IMPLEMENTATION
|
||||
friend class textinput::Manager;
|
||||
#endif
|
||||
static bool sbCompatibleFilterEnabled;
|
||||
static inline bool isCompatible(wchar_t character);
|
||||
#elif defined(TI_PC_KEYBOARD_IMPLEMENTATION)
|
||||
public:
|
||||
static wchar_t ToIndependentClass(wchar_t code);
|
||||
#endif
|
||||
static wchar_t ToIndependentClass(wchar_t wc);
|
||||
|
||||
private:
|
||||
KPRQueue mKPRQueue; // 0x00
|
||||
};
|
||||
@@ -128,61 +85,17 @@ namespace textinput {
|
||||
|
||||
// TODO - location
|
||||
class RowInfoManager {
|
||||
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION)
|
||||
friend class LayoutByNW4R;
|
||||
friend class Base;
|
||||
public:
|
||||
RowInfoManager(u16 maxLength) : mpInfo(NULL), mMaxLength(maxLength), mpAllocator(NULL) {}
|
||||
#ifdef TIINPUTFORM_IMPLEMENTATION
|
||||
void init() __attribute__((never_inline));
|
||||
#else
|
||||
void init();
|
||||
#endif
|
||||
~RowInfoManager();
|
||||
#endif
|
||||
private:
|
||||
Info_* mpInfo; // 0x00
|
||||
u16 mMaxLength; // 0x04
|
||||
MEMAllocator* mpAllocator; // 0x08
|
||||
};
|
||||
|
||||
#ifdef TISIGNWINDOW_IMPLEMENTATION
|
||||
bool isAtokActive() const;
|
||||
#endif
|
||||
#if defined(MYTILETTERFORM_IMPLEMENTATION) || defined(MYTIINPUTFORM_IMPLEMENTATION)
|
||||
virtual void create(MEMAllocator* allocator);
|
||||
virtual void init();
|
||||
virtual void onCommand(INPUT_COMMAND command, void* data);
|
||||
#endif
|
||||
virtual ~Base();
|
||||
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION)
|
||||
Base(Manager* manager);
|
||||
virtual void create(MEMAllocator* allocator);
|
||||
virtual void init();
|
||||
virtual void onCommand(INPUT_COMMAND command, void* data);
|
||||
void setCursorPos(tistring::Decolated* string, u32 pos);
|
||||
void calcCursorTimer();
|
||||
bool isAtokActive() const;
|
||||
bool isVacancy() const;
|
||||
void dirtyCacheAll();
|
||||
tistring::Decolated* getCurrentString(bool inputting);
|
||||
void moveCandidateToIdx(s32 index);
|
||||
void onPressDownHWKB();
|
||||
void onPressLeftHWKB();
|
||||
void onPressRightHWKB();
|
||||
void toggleAtokMode_(u8 operation);
|
||||
void onSpaceKeyHWKB(u32 modifiers);
|
||||
void onHKBCtrlCode(HVKCode code, u32 modifiers);
|
||||
void confirmInput_();
|
||||
void confirmInputting_(wchar_t character, bool direct, u16 letterMode, bool confirmOnly, void* holdingKey);
|
||||
void inputCharZi_(wchar_t character, u32 modifiers);
|
||||
void inputCharDefault_(wchar_t character, u32 modifiers);
|
||||
void inputInputting_(wchar_t character);
|
||||
inline bool hasZiPredictions() const;
|
||||
inline bool usesZiPrediction() const;
|
||||
inline void resetPredictionContext();
|
||||
inline void resetInputRelation();
|
||||
#endif
|
||||
|
||||
virtual void create(MEMAllocator* allocator);
|
||||
virtual void init();
|
||||
virtual void onCommand(INPUT_COMMAND command, void* data);
|
||||
|
||||
virtual void create(MEMAllocator* allocator, EditBuffer* editBuffer);
|
||||
|
||||
@@ -221,6 +134,7 @@ namespace textinput {
|
||||
virtual void setAtokDictionary(void* atokDict, int atokDictSize, void* apotDict, int apotDictSize, void* nintendoDict, int nintendoDictSize);
|
||||
virtual void closeAtokDictionary();
|
||||
virtual bool isAtokDictionaryOpened();
|
||||
bool isAtokActive() const;
|
||||
|
||||
void setZiDictionary(void* ziOemDict, void* ziDict) {
|
||||
mpZiString->openDictionary(ziDict, ziOemDict);
|
||||
@@ -230,6 +144,7 @@ namespace textinput {
|
||||
|
||||
void initZiString();
|
||||
void resetContextPredict_();
|
||||
void dirtyCacheAll();
|
||||
|
||||
void notifyChangeMode();
|
||||
|
||||
@@ -238,12 +153,9 @@ namespace textinput {
|
||||
|
||||
virtual void enableSpaceByRight(bool rightWithSpace);
|
||||
virtual void onClose();
|
||||
#ifdef TI_PC_KEYBOARD_IMPLEMENTATION
|
||||
tistring::WithAtok* getCurrentString(bool fixed);
|
||||
virtual bool canConvert() { return getCurrentString(false) == mpUnfixString; }
|
||||
#else
|
||||
virtual bool canConvert();
|
||||
#endif
|
||||
|
||||
void* getCurrentString(bool flag);
|
||||
|
||||
virtual void setString(const wchar_t* string);
|
||||
|
||||
@@ -273,10 +185,6 @@ namespace textinput {
|
||||
|
||||
virtual void onSE(sound::SE seId);
|
||||
|
||||
#ifdef MYTIMANAGER_IMPLEMENTATION
|
||||
void dirtyCacheAll();
|
||||
#endif
|
||||
|
||||
virtual void clear();
|
||||
|
||||
virtual u32 calcCursorPos(f32 x, f32 y);
|
||||
@@ -293,21 +201,15 @@ namespace textinput {
|
||||
|
||||
virtual void makeUpCursorPos(CursorPos* cursorPos, u32 pos, s32 startLine, s32 endLine);
|
||||
|
||||
#if defined(MYTIINPUTFORM_IMPLEMENTATION) || defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION) || defined(MYTILETTERFORM_IMPLEMENTATION)
|
||||
bool isVacancy() const;
|
||||
bool isPredictOn() const { return mbPredictOn; }
|
||||
|
||||
protected:
|
||||
#if !defined(TIINPUTFORM_IMPLEMENTATION) && !defined(TIMANAGER_IMPLEMENTATION)
|
||||
void setCursorPos(tistring::Decolated* string, u32 pos);
|
||||
void calcCursorTimer();
|
||||
#endif
|
||||
void resetRelation();
|
||||
#else
|
||||
private:
|
||||
#endif
|
||||
#if defined(MYTIINPUTFORM_IMPLEMENTATION) || defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION) || defined(MYTILETTERFORM_IMPLEMENTATION)
|
||||
nw4r::ut::Rect mRect;
|
||||
#else
|
||||
Rect mRect;
|
||||
#endif
|
||||
|
||||
nw4r::ut::Rect mRect; // 0x120
|
||||
nw4r::math::MTX34 mMtx; // 0x130
|
||||
Destination meDestination; // 0x160
|
||||
tistring::Decolated* mpString; // 0x164
|
||||
@@ -315,9 +217,6 @@ namespace textinput {
|
||||
tistring::WithZi* mpZiString; // 0x16C
|
||||
InputMode meInputMode; // 0x170
|
||||
PredictMode mePredictMode; // 0x174
|
||||
#ifdef TIMANAGER_IMPLEMENTATION
|
||||
friend class textinput::Manager;
|
||||
#endif
|
||||
bool mbPredictOn; // 0x178
|
||||
bool mbDoWordWrap; // 0x179
|
||||
bool mbRightWithSpace; // 0x17A
|
||||
@@ -353,18 +252,14 @@ namespace textinput {
|
||||
};
|
||||
|
||||
class LayoutByNW4R : public Base, public nw4rmanager::Layout {
|
||||
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION)
|
||||
friend class EventHandler;
|
||||
inline const nw4r::lyt::Pane* getLanguageTextPane() const;
|
||||
#endif
|
||||
public:
|
||||
#if defined(MYTIMANAGER_IMPLEMENTATION) || defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION)
|
||||
LayoutByNW4R(textinput::Manager*, nw4r::lyt::MultiArcResourceAccessor*, const char*, EventObserver*, const char*);
|
||||
#endif
|
||||
LayoutByNW4R(Manager* manager, nw4r::lyt::MultiArcResourceAccessor* resAccessor, const char* arcName,
|
||||
EventObserver* observer, const char* subName);
|
||||
~LayoutByNW4R();
|
||||
|
||||
virtual void init();
|
||||
virtual void onCommand(INPUT_COMMAND command, void* data);
|
||||
virtual void onSE(sound::SE seId);
|
||||
|
||||
virtual void create(MEMAllocator* allocator, EditBuffer* editBuffer);
|
||||
|
||||
@@ -375,9 +270,6 @@ namespace textinput {
|
||||
|
||||
virtual nw4r::math::VEC2 getScale() const;
|
||||
|
||||
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION)
|
||||
void updateRepeatInput(u32 trig, u32 hold);
|
||||
#endif
|
||||
virtual void updateInputCommon(int chan, u32 trig, u32 hold, u32 release, void* data);
|
||||
virtual bool updateInput(int chan, f32 x, f32 y, u32 trig, u32 hold, u32 release, void* data);
|
||||
virtual bool updateInput(textinput::input::HKBManager& hkbManager);
|
||||
@@ -388,38 +280,27 @@ namespace textinput {
|
||||
virtual void setRootPaneScaleFor16x9();
|
||||
virtual void setRootPaneScaleFor4x3();
|
||||
|
||||
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION) || defined(MYTILETTERFORM_IMPLEMENTATION) || defined(MYTIINPUTFORM_IMPLEMENTATION)
|
||||
virtual void onSE(sound::SE seId);
|
||||
#endif
|
||||
|
||||
virtual void visibleSeparator(bool flag);
|
||||
|
||||
#if defined(MYTIINPUTFORM_IMPLEMENTATION) || defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION) || defined(MYTILETTERFORM_IMPLEMENTATION)
|
||||
protected:
|
||||
const void* mpLayoutData;
|
||||
const void* mpLanguageData;
|
||||
const char* mpFontName;
|
||||
bool mbUpVisible;
|
||||
bool mbDownVisible;
|
||||
bool mbRepeat;
|
||||
nw4rmanager::TiEventHandler* mpInputEventHandler;
|
||||
nw4r::ut::ResFont mFont;
|
||||
int mUpRepeat;
|
||||
int mDownRepeat;
|
||||
int mLeftRepeat;
|
||||
int mRightRepeat;
|
||||
int mDeleteRepeat;
|
||||
int mConfirmRepeat;
|
||||
u32 mRepeatButtons;
|
||||
#else
|
||||
private:
|
||||
#ifdef MYTIMANAGER_IMPLEMENTATION
|
||||
u8 unk_0x2C0[0x48];
|
||||
#else
|
||||
u8 unk_0x2C0[0x4C];
|
||||
#endif
|
||||
#endif
|
||||
u8 unk_0x2C0[0x0C];
|
||||
bool mbAbleToUp; // 0x2CC
|
||||
bool mbAbleToDown; // 0x2CD
|
||||
bool mbSeparator; // 0x2CE
|
||||
u8 unk_0x2CF;
|
||||
nw4rmanager::TiEventHandler* mpInputEventHandler; // 0x2D0
|
||||
u8 unk_0x2D4[0x34];
|
||||
};
|
||||
|
||||
#ifdef TI_INPUTFORM_SAMPLE_CLASS
|
||||
class Sample : public LayoutByNW4R {
|
||||
public:
|
||||
Sample(Manager* manager, nw4r::lyt::MultiArcResourceAccessor* resAccessor, const char* arcName,
|
||||
EventObserver* observer, const char* subName)
|
||||
: LayoutByNW4R(manager, resAccessor, arcName, observer, subName) {}
|
||||
virtual ~Sample();
|
||||
};
|
||||
#endif
|
||||
}
|
||||
typedef inputform::LayoutByNW4R InputForm;
|
||||
typedef inputform::Base InputFormBase;
|
||||
|
||||
@@ -8,50 +8,16 @@ namespace textinput {
|
||||
|
||||
class KeyboardBase : public CommandSender {
|
||||
public:
|
||||
#ifdef TIMANAGER_IMPLEMENTATION
|
||||
KeyboardBase() : meLanguage(JP) {}
|
||||
#endif
|
||||
|
||||
virtual ~KeyboardBase() {}
|
||||
#if !(defined(TI_PC_KEYBOARD_IMPLEMENTATION) || defined(TIHWKEYBOARD_IMPLEMENTATION)) && !defined(TIMANAGER_IMPLEMENTATION) && !defined(TISIGNWINDOW_IMPLEMENTATION)
|
||||
virtual void create(MEMAllocator* alloc) override;
|
||||
virtual void init() override;
|
||||
|
||||
#ifndef TI_CELLPHONE_MATCH_LAYOUT
|
||||
virtual void setCommandReceiver(CommandReceiver* receiver) override;
|
||||
virtual void sendCommand(u32 command, void*) override;
|
||||
#endif
|
||||
#endif
|
||||
#if !defined(TIMANAGER_IMPLEMENTATION) && !defined(TISIGNWINDOW_IMPLEMENTATION)
|
||||
virtual void updateFromReceiver(u32, void*) override;
|
||||
#endif
|
||||
#if defined(MYTIMANAGER_IMPLEMENTATION) || defined(TIINPUTFORM_IMPLEMENTATION) || (defined(TI_PC_KEYBOARD_IMPLEMENTATION) || defined(TIHWKEYBOARD_IMPLEMENTATION)) || defined(TIMANAGER_IMPLEMENTATION) || defined(TISIGNWINDOW_IMPLEMENTATION)
|
||||
virtual void onKey(u32, void*);
|
||||
#else
|
||||
virtual void onKey(u32);
|
||||
#endif
|
||||
#ifdef TI_CELLPHONE_IMPLEMENTATION
|
||||
virtual u32 getType();
|
||||
#elif (defined(TI_PC_KEYBOARD_IMPLEMENTATION) || defined(TIHWKEYBOARD_IMPLEMENTATION)) || defined(TIMANAGER_IMPLEMENTATION) || defined(TISIGNWINDOW_IMPLEMENTATION)
|
||||
virtual int getType();
|
||||
#else
|
||||
virtual void getType();
|
||||
#endif
|
||||
#ifdef TI_CELLPHONE_IMPLEMENTATION
|
||||
virtual void setLanguage(Language language) { meLanguage = language; }
|
||||
#else
|
||||
virtual void setLanguage(Language language);
|
||||
#endif
|
||||
#if (defined(TI_PC_KEYBOARD_IMPLEMENTATION) || defined(TIHWKEYBOARD_IMPLEMENTATION)) || defined(TIMANAGER_IMPLEMENTATION) || defined(TISIGNWINDOW_IMPLEMENTATION)
|
||||
#ifdef TISIGNWINDOW_IMPLEMENTATION
|
||||
virtual Language getLanguage() const;
|
||||
#else
|
||||
virtual Language getLanguage() const { return meLanguage; }
|
||||
#endif
|
||||
virtual void update() {}
|
||||
#else
|
||||
virtual Language getLanguage() const;
|
||||
virtual void update();
|
||||
#endif
|
||||
virtual void onActive();
|
||||
|
||||
protected:
|
||||
|
||||
@@ -19,13 +19,12 @@ namespace textinput {
|
||||
bool isHoldingShift() const {
|
||||
return isHWPressedShift() || isPressedShiftB();
|
||||
}
|
||||
#ifdef TI_PC_KEYBOARD_IMPLEMENTATION
|
||||
u8 isCapsLock() const { return mbCpasLock; }
|
||||
void setPressedShiftB(bool pressed) { mbPressedShiftB = pressed; }
|
||||
#endif
|
||||
u8 isHWPressedShift() const { return mbPressedShift; }
|
||||
u8 isPressedShiftB() const { return mbPressedShiftB; }
|
||||
void setHWPressedShift(const u8& arg) { mbPressedShift = arg; }
|
||||
void setHWPressedShift(u8 arg) { mbPressedShift = arg; }
|
||||
void setPressedShiftB(u8 arg) { mbPressedShiftB = arg; }
|
||||
void clearPressedShift() { mbPressedShift = 0; mbPressedShiftB = 0; }
|
||||
|
||||
class Singleton {
|
||||
public:
|
||||
|
||||
@@ -9,6 +9,8 @@
|
||||
#include "tiToolBar.h"
|
||||
#include "tiPcKeyboard.h"
|
||||
#include "tiCellPhone.h"
|
||||
#include "tiPredictLang.h"
|
||||
#include "tiSignWindow.h"
|
||||
|
||||
#include <nw4r/lyt/pane.h>
|
||||
#include <nw4r/lyt/arcResourceAccessor.h>
|
||||
@@ -23,25 +25,16 @@
|
||||
namespace textinput {
|
||||
class EventObserver {
|
||||
public:
|
||||
virtual void onInput(CommandReceiver::INPUT_COMMAND command, void* data) {} // 0x08
|
||||
virtual void onCommand(CommandReceiver::INPUT_COMMAND command, void* data) {} // 0x0C
|
||||
virtual void onEvent(nw4r::lyt::Pane* pane, u32 event) {} // 0x10
|
||||
virtual void onInput(CommandReceiver::INPUT_COMMAND command, void* data); // 0x08
|
||||
virtual void onCommand(CommandReceiver::INPUT_COMMAND command, void* data); // 0x0C
|
||||
virtual void onEvent(nw4r::lyt::Pane* pane, u32 event); // 0x10
|
||||
|
||||
virtual void onSE(sound::SE seId) {}
|
||||
#ifdef TIMANAGER_IMPLEMENTATION
|
||||
virtual void onOK();
|
||||
virtual void onCancel();
|
||||
virtual void onOutOfLength();
|
||||
#else
|
||||
virtual void onOK() { printf("OK!\n"); }
|
||||
virtual void onCancel() { printf("Cancel!\n"); }
|
||||
virtual void onOutOfLength() { printf("OutOfLength\n"); }
|
||||
#endif
|
||||
virtual void onSE(sound::SE seId);
|
||||
virtual void onOK();
|
||||
virtual void onCancel();
|
||||
virtual void onOutOfLength();
|
||||
};
|
||||
|
||||
#ifdef TIMANAGER_IMPLEMENTATION
|
||||
namespace predictlang { class LayoutByNW4R; }
|
||||
#endif
|
||||
class Manager : public Base {
|
||||
public:
|
||||
Manager(MEMAllocator* allocator, nw4r::lyt::MultiArcResourceAccessor* multiArc, textinput::EventObserver* event);
|
||||
@@ -64,10 +57,7 @@ namespace textinput {
|
||||
virtual void setWCString(const wchar_t* string);
|
||||
|
||||
virtual void setLanguage(Language language);
|
||||
virtual Language getLanguage() const { return meLanguage; }
|
||||
#ifdef MYTIMANAGER_IMPLEMENTATION
|
||||
Language getLanguageForMemo() const { return meLanguage; }
|
||||
#endif
|
||||
virtual Language getLanguage() const;
|
||||
|
||||
virtual void setDestination(Destination destination);
|
||||
|
||||
@@ -78,74 +68,49 @@ namespace textinput {
|
||||
|
||||
virtual void setAspectRatio(bool b4x3);
|
||||
|
||||
#ifdef MYTIMANAGER_IMPLEMENTATION
|
||||
MEMAllocator* getAllocatorForMemo() const { return mpAllocator; }
|
||||
inputform::EditBuffer* getEditBufferForMemo() const { return mpEditBuffer; }
|
||||
void setEditBufferForMemo(inputform::EditBuffer* editBuffer) { mpEditBuffer = editBuffer; }
|
||||
void setHWKeyboardForMemo(keyboard::hwkey::HWKeyboard* keyboard) { mpHWKeyboard = keyboard; }
|
||||
nw4r::lyt::MultiArcResourceAccessor* getMultiArcForMemo() const { return mpMultiArcResourceAccessor; }
|
||||
EventObserver* getEventObserverForMemo() const { return mpEventObserver; }
|
||||
InputForm* getInputFormForMemo() const { return mpInputForm; }
|
||||
void setInputFormForMemo(InputForm* inputForm) { mpInputForm = inputForm; }
|
||||
toolbar::LayoutByNW4R* getToolBarForMemo() const { return mpToolBar; }
|
||||
candidatebox::LayoutByNW4R* getCandidateBoxForMemo() const { return mpCandidateBox; }
|
||||
void setPCKeyboardForMemo(keyboard::pctype::LayoutByNW4R* keyboard) { mpPCKeyboard = keyboard; }
|
||||
void setCellPhoneKeyboardForMemo(keyboard::cellphonetype::LayoutByNW4R* keyboard) { mpCellPhoneKeyboard = keyboard; }
|
||||
void setCandidateBoxForMemo(candidatebox::LayoutByNW4R* candidateBox) { mpCandidateBox = candidateBox; }
|
||||
void setToolBarForMemo(toolbar::LayoutByNW4R* toolBar) { mpToolBar = toolBar; }
|
||||
void setPredictLanguageDialogForMemo(void* dialog) { mpPredictLanguageDialog = dialog; }
|
||||
void setSignWindowForMemo(void* signWindow) { mpSignWindow = signWindow; }
|
||||
void* getSignWindowForMemo() const { return mpSignWindow; }
|
||||
keyboard::pctype::LayoutByNW4R* getPCKeyboardForMemo() const { return mpPCKeyboard; }
|
||||
keyboard::cellphonetype::LayoutByNW4R* getCellPhoneKeyboardForMemo() const { return mpCellPhoneKeyboard; }
|
||||
Destination getDestinationForMemo() const { return meDestination; }
|
||||
void initAspect();
|
||||
#endif
|
||||
|
||||
virtual void setSecretInputMode(bool secretInputMode) { mpInputForm->setSecretModeOn(secretInputMode); }
|
||||
#if defined(IPL_ADDRESS_EDIT_CPP) || defined(TIMANAGER_IMPLEMENTATION)
|
||||
void enableKSXFilter(bool compatibleFilter);
|
||||
#endif
|
||||
|
||||
virtual void setDefaultPredictionJP(int num, const char** predicts);
|
||||
virtual void setFixedPredictionJP(int num, const char** predicts);
|
||||
|
||||
#ifdef TIMANAGER_IMPLEMENTATION
|
||||
virtual void setTitleText(wchar_t* titleText);
|
||||
void initAspect();
|
||||
#else
|
||||
virtual void setTitleText(const wchar_t* titleText);
|
||||
#endif
|
||||
virtual void setTitleText(wchar_t* titleText);
|
||||
|
||||
virtual void start() {}
|
||||
virtual void end() {}
|
||||
void setTitleText(const wchar_t* titleText) {
|
||||
nw4r::lyt::Pane* pane = mpInputForm->getPane("T_title_text");
|
||||
nw4r::lyt::TextBox* textBox = nw4r::ut::DynamicCast<nw4r::lyt::TextBox*>(pane);
|
||||
if (textBox != NULL) {
|
||||
textBox->SetString(titleText, 0);
|
||||
}
|
||||
}
|
||||
|
||||
virtual void start();
|
||||
virtual void end();
|
||||
|
||||
#ifdef TIHWKEYBOARD_IMPLEMENTATION
|
||||
EventObserver* getEventObserverForHardware() const { return mpEventObserver; }
|
||||
#endif
|
||||
virtual InputForm* getInputForm() { return mpInputForm; }
|
||||
virtual const InputForm* getInputForm() const { return mpInputForm; }
|
||||
virtual const InputForm* getInputForm() const;
|
||||
|
||||
virtual keyboard::hwkey::HWKeyboard* getHWKeyboard() { return mpHWKeyboard; }
|
||||
virtual const keyboard::hwkey::HWKeyboard* getHWKeyboard() const { return mpHWKeyboard; }
|
||||
virtual const keyboard::hwkey::HWKeyboard* getHWKeyboard() const;
|
||||
|
||||
virtual keyboard::pctype::LayoutByNW4R* getPCKeyboard() { return mpPCKeyboard; }
|
||||
virtual const keyboard::pctype::LayoutByNW4R* getPCKeyboard() const { return mpPCKeyboard; }
|
||||
virtual keyboard::pctype::LayoutByNW4R* getPCKeyboard();
|
||||
virtual const keyboard::pctype::LayoutByNW4R* getPCKeyboard() const;
|
||||
|
||||
virtual keyboard::cellphonetype::LayoutByNW4R* getCellPhoneKeyboard() { return mpCellPhoneKeyboard; }
|
||||
virtual const keyboard::cellphonetype::LayoutByNW4R* getCellPhoneKeyboard() const { return mpCellPhoneKeyboard; }
|
||||
virtual const keyboard::cellphonetype::LayoutByNW4R* getCellPhoneKeyboard() const;
|
||||
|
||||
virtual void* getSignKeyboard() { return mpSignWindow; }
|
||||
virtual const void* getSignKeyboard() const { return mpSignWindow; }
|
||||
virtual void* getSignKeyboard();
|
||||
virtual const void* getSignKeyboard() const;
|
||||
|
||||
virtual candidatebox::LayoutByNW4R* getCandidateBox() { return mpCandidateBox; }
|
||||
virtual candidatebox::LayoutByNW4R* getCandidateBox();
|
||||
virtual const candidatebox::LayoutByNW4R* getCandidateBox() const { return mpCandidateBox; }
|
||||
|
||||
virtual toolbar::LayoutByNW4R* getToolBar() { return mpToolBar; }
|
||||
virtual const toolbar::LayoutByNW4R* getToolBar() const { return mpToolBar; }
|
||||
virtual toolbar::LayoutByNW4R* getToolBar();
|
||||
virtual const toolbar::LayoutByNW4R* getToolBar() const;
|
||||
|
||||
virtual void* getPredictLanguageSelectDialog() { return mpPredictLanguageDialog; }
|
||||
virtual const void* getPredictLanguageSelectDialog() const { return mpPredictLanguageDialog; }
|
||||
virtual void* getPredictLanguageSelectDialog();
|
||||
virtual const void* getPredictLanguageSelectDialog() const;
|
||||
|
||||
EventObserver* getEventObserver() { return mpEventObserver; }
|
||||
|
||||
virtual inputform::EditBuffer* createEditBuffer();
|
||||
virtual keyboard::hwkey::HWKeyboard* createHWKeyboard();
|
||||
@@ -161,14 +126,17 @@ namespace textinput {
|
||||
virtual void setLayoutScaleFor4x3();
|
||||
|
||||
void enableCompatibleFilter(bool compatibleFilter);
|
||||
void enableKSXFilter(bool flag);
|
||||
|
||||
void startPredictTurnOn(bool flag);
|
||||
bool isPredictTurning() const;
|
||||
|
||||
bool isVacancy() const;
|
||||
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION)
|
||||
bool isPredictTurning() const;
|
||||
void startPredictTurnOn(bool enabled);
|
||||
#endif
|
||||
|
||||
private:
|
||||
protected:
|
||||
void initAspect();
|
||||
|
||||
protected:
|
||||
MEMAllocator* mpAllocator; // 0x04
|
||||
nw4r::lyt::MultiArcResourceAccessor* mpMultiArcResourceAccessor; // 0x08
|
||||
|
||||
@@ -180,14 +148,9 @@ namespace textinput {
|
||||
InputForm* mpInputForm; // 0x1C
|
||||
candidatebox::LayoutByNW4R* mpCandidateBox; // 0x20
|
||||
toolbar::LayoutByNW4R* mpToolBar; // 0x24
|
||||
#ifdef TIMANAGER_IMPLEMENTATION
|
||||
predictlang::LayoutByNW4R* mpPredictLanguageDialog;
|
||||
keyboard::signwindow::LayoutByNW4R* mpSignWindow;
|
||||
#else
|
||||
void* mpPredictLanguageDialog; // 0x28
|
||||
void* mpSignWindow; // 0x2C
|
||||
predictlang::LayoutByNW4R* mpPredictLanguageDialog; // 0x28
|
||||
keyboard::signwindow::LayoutByNW4R* mpSignWindow; // 0x2C
|
||||
|
||||
#endif
|
||||
EventObserver* mpEventObserver; // 0x30
|
||||
|
||||
Destination meDestination; // 0x34
|
||||
|
||||
@@ -14,29 +14,20 @@ namespace textinput {
|
||||
class TiEventHandler : public gui::EventHandler {
|
||||
public:
|
||||
typedef struct Input {
|
||||
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION) || defined(TISIGNWINDOW_IMPLEMENTATION) || defined(MYTILETTERFORM_IMPLEMENTATION)
|
||||
u32 controller;
|
||||
f32 x;
|
||||
f32 y;
|
||||
u32 trigger;
|
||||
u32 hold;
|
||||
u32 release;
|
||||
u8 remaining[8];
|
||||
#else
|
||||
// todo
|
||||
u32 field_0x00; // 0x00
|
||||
u8 dummy[8];
|
||||
u32 field_0x0C; // 0x0C
|
||||
u32 field_0x10; // 0x10
|
||||
u8 dummy2[12];
|
||||
#endif
|
||||
u32 field_0x00; // 0x00 chan
|
||||
f32 mfX; // 0x04
|
||||
f32 mfY; // 0x08
|
||||
u32 field_0x0C; // 0x0C trigger
|
||||
u32 field_0x10; // 0x10 hold
|
||||
u32 field_0x14; // 0x14 release
|
||||
u8 dummy[8]; // 0x18
|
||||
} Input;
|
||||
|
||||
virtual void onEvent(gui::GUIComponent& comp, u32 event, void* data); // 0x0C
|
||||
|
||||
virtual void onTiEvent(gui::PaneComponent* paneComponent, u32 event, Input* input) = 0; // 0x18
|
||||
|
||||
virtual void setEventObserver(EventObserver *event) { mpEventObserver = event; } // 0x1C
|
||||
virtual void setEventObserver(EventObserver *event); // 0x1C
|
||||
|
||||
protected:
|
||||
EventObserver* mpEventObserver; // 0x08
|
||||
@@ -90,35 +81,21 @@ namespace textinput {
|
||||
PE_5,
|
||||
PE_6,
|
||||
PE_7,
|
||||
PE_8,
|
||||
PE_9,
|
||||
PE_10,
|
||||
PE_11,
|
||||
PE_Last,
|
||||
} AnmPaneEvent;
|
||||
|
||||
virtual void init() {} // 0x08
|
||||
virtual void calc(); // 0x0C
|
||||
|
||||
#ifdef TI_PC_KEYBOARD_IMPLEMENTATION
|
||||
virtual void onAnmEvent(AnmPaneEvent) {}
|
||||
#else
|
||||
virtual void onAnmEvent(AnmPaneEvent paneEvent);
|
||||
#endif // 0x10
|
||||
virtual void onAnmEvent(AnmPaneEvent paneEvent); // 0x10
|
||||
|
||||
virtual void changeAnimation(u32 id); // 0x14
|
||||
#ifdef TI_PC_KEYBOARD_IMPLEMENTATION
|
||||
virtual bool isInAnimation() { return mpCurrentAnim != NULL; }
|
||||
#else
|
||||
virtual bool isInAnimation();
|
||||
#endif // 0x18
|
||||
#ifdef TI_PC_KEYBOARD_IMPLEMENTATION
|
||||
virtual Anim* searchAnimation(u32 id) {
|
||||
for (Anim* animation = static_cast<Anim*>(nw4r::ut::List_GetNext(&mAnms, NULL)); animation != NULL;
|
||||
animation = static_cast<Anim*>(nw4r::ut::List_GetNext(&mAnms, animation))) {
|
||||
if (animation->muID == id) return animation;
|
||||
}
|
||||
return NULL;
|
||||
}
|
||||
#else
|
||||
virtual Anim* searchAnimation(u32 id);
|
||||
#endif // 0x1C
|
||||
virtual bool isInAnimation(); // 0x18
|
||||
virtual Anim* searchAnimation(u32 id); // 0x1C
|
||||
|
||||
virtual ~AnmPane(); // 0x20
|
||||
|
||||
@@ -156,11 +133,11 @@ namespace textinput {
|
||||
|
||||
class AnimPaneGroup {
|
||||
public:
|
||||
#ifdef MYTIINPUTFORM_IMPLEMENTATION
|
||||
AnimPaneGroup() {}
|
||||
AnimPaneGroup(nw4r::lyt::Group* group) : mpGroup(group) {
|
||||
nw4r::ut::List_Init(&mAnmPaneList, offsetof(AnmPane, mGroupLink));
|
||||
}
|
||||
#endif
|
||||
|
||||
virtual void create() {} // 0x08
|
||||
virtual void init() {} // 0x0C
|
||||
|
||||
@@ -214,11 +191,7 @@ namespace textinput {
|
||||
|
||||
virtual nw4r::lyt::Pane* get(int i) { return mpaFifo[i]; } // 0x10
|
||||
virtual nw4r::lyt::Pane* getLast() { // 0x14
|
||||
#ifdef TI_PC_KEYBOARD_IMPLEMENTATION
|
||||
for (int i = MAX_COUNT-1; i > -1; i--) {
|
||||
#else
|
||||
for (int i = MAX_COUNT-1; i > -1; i++) {
|
||||
#endif
|
||||
if (mpaFifo[i] != NULL) {
|
||||
return mpaFifo[i];
|
||||
}
|
||||
@@ -247,14 +220,14 @@ namespace textinput {
|
||||
virtual bool updateInput(int point, f32 x, f32 y, u32 trig, u32 hold, u32 release, void* data); // 0x20
|
||||
virtual bool updateInput(input::HKBManager& hkbManager); // 0x24
|
||||
|
||||
virtual TiLayout* getLayout() { return mpLayout; } // 0x28
|
||||
virtual TiLayout* getLayout(); // 0x28
|
||||
|
||||
virtual nw4r::lyt::Pane* getPane(const char* paneName); // 0x2C
|
||||
virtual const nw4r::lyt::Pane* getPane(const char* paneName) const; // 0x30
|
||||
|
||||
virtual u32 getFlightDuration(int point, const char* paneName); // 0x34
|
||||
|
||||
virtual void setAnimOn(bool flag) { mbAnimOn = flag; } // 0x38
|
||||
virtual void setAnimOn(bool flag); // 0x38
|
||||
|
||||
virtual void drawPane(const char* paneName); // 0x3C
|
||||
|
||||
@@ -263,16 +236,8 @@ namespace textinput {
|
||||
|
||||
virtual void setProjectionMtx(); // 0x48
|
||||
|
||||
#ifdef TI_PC_KEYBOARD_IMPLEMENTATION
|
||||
virtual void setPaneLastDrawReceived(nw4r::lyt::Pane* pane) { mAnmPaneFifo.push(pane); }
|
||||
#else
|
||||
virtual void setPaneLastDrawReceived(nw4r::lyt::Pane* paneLastDraw);
|
||||
#endif // 0x4C
|
||||
#ifdef TI_PC_KEYBOARD_IMPLEMENTATION
|
||||
virtual void initPaneLastDrawReceived() { mAnmPaneFifo.init(); }
|
||||
#else
|
||||
virtual void initPaneLastDrawReceived();
|
||||
#endif // 0x50
|
||||
virtual void setPaneLastDrawReceived(nw4r::lyt::Pane* paneLastDraw); // 0x4C
|
||||
virtual void initPaneLastDrawReceived(); // 0x50
|
||||
|
||||
virtual void setVisible(const char* paneName, bool flag); // 0x54
|
||||
virtual bool isVisible(const char* paneName, bool* result) const; // 0x58
|
||||
@@ -282,8 +247,8 @@ namespace textinput {
|
||||
virtual AnmPane* searchAnmPane(const char* paneName); // 0x60
|
||||
virtual AnmPane* searchAnmPane(wchar_t ch); // 0x64
|
||||
|
||||
virtual nw4r::ut::List& getAnmPaneList() { return mAnmPanes; } // 0x68
|
||||
virtual gui::PaneManager* getPaneManager() { return mpPaneManager; } // 0x6C
|
||||
virtual nw4r::ut::List& getAnmPaneList(); // 0x68
|
||||
virtual gui::PaneManager* getPaneManager(); // 0x6C
|
||||
|
||||
virtual void AdjustPaneMtx(Mtx& mtx, const nw4r::lyt::DrawInfo& drawInfo, const nw4r::math::MTX34& mGlobalMtx); // 0x70
|
||||
|
||||
|
||||
@@ -1,210 +1,340 @@
|
||||
#ifndef TEXTINPUT_PC_KEYBOARD_H
|
||||
#define TEXTINPUT_PC_KEYBOARD_H
|
||||
|
||||
#if (defined(TI_PC_KEYBOARD_IMPLEMENTATION) || defined(TIHWKEYBOARD_IMPLEMENTATION)) || defined(TIMANAGER_IMPLEMENTATION) || defined(TISIGNWINDOW_IMPLEMENTATION)
|
||||
#include "tiPcKeyboardImpl.h"
|
||||
#else
|
||||
|
||||
#include "tiNw4rManager.h"
|
||||
#include "tiTextInputBase.h"
|
||||
#if defined(MYTIMANAGER_IMPLEMENTATION) || defined(TIINPUTFORM_IMPLEMENTATION)
|
||||
#include "tiKeyboard.h"
|
||||
#endif
|
||||
#include "tiNw4rManager.h"
|
||||
#include "tiGUIManager.h"
|
||||
|
||||
namespace textinput {
|
||||
class Manager;
|
||||
|
||||
namespace predictlang {
|
||||
class LayoutByNW4R;
|
||||
}
|
||||
|
||||
namespace keyboard {
|
||||
namespace signwindow {
|
||||
class LayoutByNW4R;
|
||||
}
|
||||
|
||||
namespace pctype {
|
||||
|
||||
#if defined(MYTIMANAGER_IMPLEMENTATION) || defined(TIINPUTFORM_IMPLEMENTATION)
|
||||
class UIObj {
|
||||
class LayoutByNW4R;
|
||||
class AnmPane;
|
||||
|
||||
class UIObj : public gui::EventHandler {
|
||||
public:
|
||||
class Listener {
|
||||
public:
|
||||
virtual void onEvent(UIObj*, u32, void*);
|
||||
virtual void onEvent(UIObj* uiObj, u32, void*) = 0; // 0x08
|
||||
};
|
||||
|
||||
UIObj(u32 ctrlNo, LayoutByNW4R* layout, Listener* listener) : mCtrlNo(ctrlNo), mpLayout(layout) {
|
||||
mpListener = listener;
|
||||
}
|
||||
|
||||
virtual ~UIObj(); // 0x08
|
||||
virtual void onEvent(gui::GUIComponent& comp, u32 event, void* data); // 0x0C
|
||||
virtual void onGUIEvent(gui::PaneComponent& pane, u32 event, nw4rmanager::TiEventHandler::Input* input); // 0x18
|
||||
|
||||
protected:
|
||||
u32 mCtrlNo; // 0x08
|
||||
LayoutByNW4R* mpLayout; // 0x0C
|
||||
Listener* mpListener; // 0x10
|
||||
};
|
||||
#endif
|
||||
|
||||
// TODO
|
||||
#if defined(MYTIMANAGER_IMPLEMENTATION) || defined(TIINPUTFORM_IMPLEMENTATION)
|
||||
class Base : public textinput::keyboard::KeyboardBase {
|
||||
#else
|
||||
class Base : public CommandSender {
|
||||
#endif
|
||||
class UIModifierButton : public UIObj {
|
||||
friend class LayoutByNW4R;
|
||||
|
||||
public:
|
||||
enum TranslateMode {
|
||||
UIModifierButton(u32 ctrlNo, LayoutByNW4R* layout, Listener* listener);
|
||||
|
||||
virtual ~UIModifierButton();
|
||||
virtual void onGUIEvent(gui::PaneComponent& pane, u32 event, nw4rmanager::TiEventHandler::Input* input);
|
||||
|
||||
private:
|
||||
gui::PaneComponent* mpPaneComp1; // 0x14
|
||||
gui::PaneComponent* mpPaneComp2; // 0x18
|
||||
nw4rmanager::AnmPane* mpAnmPane; // 0x1C
|
||||
u8 mbFocused; // 0x20
|
||||
};
|
||||
|
||||
class UIModePanel : public UIObj {
|
||||
friend class LayoutByNW4R;
|
||||
|
||||
public:
|
||||
UIModePanel(u32 ctrlNo, LayoutByNW4R* layout, Listener* listener);
|
||||
|
||||
virtual ~UIModePanel();
|
||||
virtual void onGUIEvent(gui::PaneComponent& pane, u32 event, nw4rmanager::TiEventHandler::Input* input);
|
||||
|
||||
void Create(nw4rmanager::Layout* layout);
|
||||
|
||||
private:
|
||||
u32 unk_0x14; // 0x14
|
||||
gui::PaneComponent* mpComps1[5]; // 0x18
|
||||
gui::PaneComponent* mpComps2[5]; // 0x2C
|
||||
nw4rmanager::AnmPane* mpAnmPanes[5]; // 0x40
|
||||
nw4r::lyt::Pane* mExtraPanes[3]; // 0x54
|
||||
GXTexObj mTexObjs[4]; // 0x60
|
||||
};
|
||||
|
||||
class AnmPane : public nw4rmanager::AnmPane {
|
||||
public:
|
||||
AnmPane(nw4r::lyt::Pane* pane, nw4rmanager::AnmObserver* observer)
|
||||
: nw4rmanager::AnmPane(pane, observer) {
|
||||
mState = 0;
|
||||
}
|
||||
|
||||
virtual void init(); // 0x08
|
||||
virtual void changeAnimation(u32 id); // 0x14
|
||||
virtual ~AnmPane(); // 0x20
|
||||
virtual u32 getState() const { return mState; } // 0x24
|
||||
virtual u32 getKeyType() const { return mKeyType; } // 0x28
|
||||
|
||||
protected:
|
||||
s32 mState; // 0x2C
|
||||
u32 mKeyType; // 0x30
|
||||
};
|
||||
|
||||
class NormalButtonAnmPane : public AnmPane {
|
||||
public:
|
||||
NormalButtonAnmPane(nw4r::lyt::Pane* pane, nw4rmanager::AnmObserver* observer) : AnmPane(pane, observer) {
|
||||
mKeyType = 0;
|
||||
}
|
||||
|
||||
virtual void onAnmEvent(AnmPaneEvent paneEvent); // 0x10
|
||||
virtual ~NormalButtonAnmPane();
|
||||
};
|
||||
|
||||
class ShiftCapsAnmPane : public AnmPane {
|
||||
public:
|
||||
ShiftCapsAnmPane(nw4r::lyt::Pane* pane, nw4rmanager::AnmObserver* observer) : AnmPane(pane, observer) {
|
||||
mKeyType = 1;
|
||||
mbFocused = false;
|
||||
}
|
||||
|
||||
virtual void onAnmEvent(AnmPaneEvent paneEvent); // 0x10
|
||||
virtual ~ShiftCapsAnmPane();
|
||||
|
||||
virtual bool isFocused() const; // 0x2C
|
||||
|
||||
private:
|
||||
u8 mbFocused; // 0x34
|
||||
};
|
||||
|
||||
class ToggleButtonAnmPane : public AnmPane {
|
||||
public:
|
||||
ToggleButtonAnmPane(nw4r::lyt::Pane* pane, nw4rmanager::AnmObserver* observer) : AnmPane(pane, observer) {
|
||||
mKeyType = 2;
|
||||
}
|
||||
|
||||
virtual void onAnmEvent(AnmPaneEvent paneEvent); // 0x10
|
||||
virtual ~ToggleButtonAnmPane();
|
||||
};
|
||||
|
||||
class OnOffButtonAnmPane : public AnmPane {
|
||||
public:
|
||||
OnOffButtonAnmPane(nw4r::lyt::Pane* pane, nw4rmanager::AnmObserver* observer) : AnmPane(pane, observer) {
|
||||
mKeyType = 3;
|
||||
}
|
||||
|
||||
virtual void onAnmEvent(AnmPaneEvent paneEvent); // 0x10
|
||||
virtual ~OnOffButtonAnmPane();
|
||||
};
|
||||
|
||||
class EventHandler : public nw4rmanager::TiEventHandler {
|
||||
public:
|
||||
EventHandler(LayoutByNW4R* layout) : mpLayout(layout) {}
|
||||
|
||||
virtual ~EventHandler(); // 0x08
|
||||
virtual void onTiEvent(gui::PaneComponent* paneComponent, u32 event, TiEventHandler::Input* input); // 0x18
|
||||
|
||||
private:
|
||||
LayoutByNW4R* mpLayout; // 0x0C
|
||||
};
|
||||
|
||||
class Base : public KeyboardBase {
|
||||
public:
|
||||
typedef enum TranslateMode {
|
||||
TM_00,
|
||||
#ifdef TIINPUTFORM_IMPLEMENTATION
|
||||
TM_Kana,
|
||||
TM_Roman,
|
||||
#endif
|
||||
};
|
||||
TM_01,
|
||||
TM_02,
|
||||
TM_03,
|
||||
} TranslateMode;
|
||||
|
||||
enum InputType {
|
||||
IT_00,
|
||||
IT_01,
|
||||
IT_02,
|
||||
IT_03,
|
||||
IT_04,
|
||||
};
|
||||
|
||||
#if defined(MYTIMANAGER_IMPLEMENTATION) || defined(TIINPUTFORM_IMPLEMENTATION)
|
||||
enum InputMode {
|
||||
typedef enum InputMode {
|
||||
IM_00,
|
||||
IM_01,
|
||||
IM_02,
|
||||
IM_03,
|
||||
IM_04,
|
||||
IM_05,
|
||||
IM_06,
|
||||
IM_07,
|
||||
IM_08,
|
||||
} InputMode;
|
||||
|
||||
typedef enum InputType {
|
||||
IT_00,
|
||||
IT_01,
|
||||
IT_02,
|
||||
IT_03,
|
||||
IT_04,
|
||||
} InputType;
|
||||
|
||||
struct KeyState {
|
||||
#ifdef TI_PCTYPE_SAMPLE_CLASS
|
||||
KeyState() : mFlags(0), mIsABC(0), mAIUFlags(0), mLanguage((Language)1) {}
|
||||
#endif
|
||||
|
||||
void refresh_();
|
||||
void refreshText(nw4r::lyt::Pane* pane);
|
||||
void setABCFlag(u32 flag);
|
||||
wchar_t getWCCode(u32 keyType);
|
||||
wchar_t getWCCode(char* out);
|
||||
|
||||
u32 mFlags; // 0x00
|
||||
u32 mIsABC; // 0x04
|
||||
u32 mAIUFlags; // 0x08
|
||||
Language mLanguage; // 0x0C
|
||||
const void* mpLanguageDep; // 0x10
|
||||
Base* mpBase; // 0x14
|
||||
};
|
||||
|
||||
#ifdef TI_PCTYPE_SAMPLE_CLASS
|
||||
Base(Manager* manager) {
|
||||
mKeyState.mpLanguageDep = NULL;
|
||||
mKeyState.mpBase = this;
|
||||
mpAllocator = NULL;
|
||||
mbOnlyQwerty = false;
|
||||
mpManager = manager;
|
||||
}
|
||||
#endif
|
||||
|
||||
virtual ~Base();
|
||||
virtual void create(MEMAllocator* allocator) override; // 0x0C
|
||||
virtual void init() override; // 0x10
|
||||
virtual void updateFromReceiver(u32, void*) override; // 0x1C
|
||||
virtual void onKey(u32, void*); // 0x20
|
||||
virtual int getType(); // 0x24
|
||||
virtual void setLanguage(Language language) override; // 0x28
|
||||
virtual void onActive() override; // 0x34
|
||||
virtual void inputCharCode(wchar_t wc); // 0x38
|
||||
virtual void* getState(); // 0x3C
|
||||
virtual bool isShiftOn() const; // 0x40
|
||||
virtual bool isCapsOn() const; // 0x44
|
||||
virtual bool isABC(); // 0x48
|
||||
virtual void setABC(bool); // 0x4C
|
||||
virtual int getABCInputMode() const; // 0x50
|
||||
virtual int getAIUInputMode() const; // 0x54
|
||||
virtual TranslateMode getTranslateMode() const; // 0x58
|
||||
virtual void setTranslateMode(TranslateMode mode); // 0x5C
|
||||
virtual void onlyQwerty(bool); // 0x60
|
||||
virtual void setLangKeyActive(bool); // 0x64
|
||||
virtual void setInputModeJP(bool, u32, u32); // 0x68
|
||||
virtual void setInputModeCK(u32); // 0x6C
|
||||
virtual void refreshState(); // 0x70
|
||||
virtual void changeABCInputMode(InputMode mode); // 0x74
|
||||
virtual void changeAIUInputMode(InputMode mode); // 0x78
|
||||
virtual void onClose(); // 0x7C
|
||||
virtual wchar_t getWCCode(char* out); // 0x80
|
||||
virtual u32 getControlKey(char* out); // 0x84
|
||||
virtual void sendInputWChar(wchar_t wc, bool flag); // 0x88
|
||||
virtual void goSignInputMode(); // 0x8C
|
||||
virtual void changePredictLanguage(); // 0x90
|
||||
virtual void updateFixMode(); // 0x94
|
||||
|
||||
protected:
|
||||
Manager* mgr() { return mpManager; }
|
||||
|
||||
public:
|
||||
u8 unk_0x14; // 0x14
|
||||
u8 unk_0x15[3]; // 0x15
|
||||
u32 unk_0x18; // 0x18
|
||||
const void* mpLanguageDep; // 0x1C
|
||||
KeyState mKeyState; // 0x20
|
||||
MEMAllocator* mpAllocator; // 0x38
|
||||
u8 mbOnlyQwerty; // 0x3C
|
||||
u8 mbLangKeyActive; // 0x3D
|
||||
u8 unk_0x3E[2]; // 0x3E
|
||||
Manager* mpManager; // 0x40
|
||||
};
|
||||
|
||||
class LayoutByNW4R : public Base, public nw4rmanager::Layout, public UIObj::Listener {
|
||||
public:
|
||||
#ifdef TI_PCTYPE_SAMPLE_CLASS
|
||||
LayoutByNW4R(Manager* manager, nw4r::lyt::MultiArcResourceAccessor* resAccessor, const char* arcName, EventObserver* observer)
|
||||
: Base(manager), nw4rmanager::Layout(resAccessor, arcName, observer), mpEventHandler(NULL),
|
||||
mShiftButton(1, this, this), mCapsButton(0, this, this), mModePanel(2, this, this) {}
|
||||
#endif
|
||||
|
||||
virtual ~LayoutByNW4R();
|
||||
virtual void create(MEMAllocator* allocator) override;
|
||||
virtual void init() override;
|
||||
virtual void updateFromReceiver(u32, void*) override;
|
||||
virtual void onKey(u32, void*) override;
|
||||
#ifdef TI_CELLPHONE_IMPLEMENTATION
|
||||
virtual u32 getType() override;
|
||||
#else
|
||||
virtual void getType() override;
|
||||
#endif
|
||||
virtual void setLanguage(Language) override;
|
||||
virtual void setLanguage(Language language) override;
|
||||
virtual void onActive() override;
|
||||
virtual void inputCharCode(u16);
|
||||
virtual void getState();
|
||||
virtual bool isShiftOn() const;
|
||||
virtual bool isCapsOn() const;
|
||||
virtual bool isABC();
|
||||
virtual void setABC(bool);
|
||||
virtual InputMode getABCInputMode() const;
|
||||
virtual InputMode getAIUInputMode() const;
|
||||
virtual TranslateMode getTranslateMode() const;
|
||||
virtual void setTranslateMode(TranslateMode);
|
||||
virtual void onlyQwerty(bool);
|
||||
virtual void setLangKeyActive(bool);
|
||||
virtual void setInputModeJP(bool, u32, u32);
|
||||
virtual void setInputModeCK(u32);
|
||||
virtual void refreshState();
|
||||
virtual void changeABCInputMode(InputMode);
|
||||
virtual void changeAIUInputMode(InputMode);
|
||||
virtual void onClose();
|
||||
virtual void getWCCode(char*);
|
||||
virtual void getControlKey(char*);
|
||||
virtual void sendInputWChar(u16, bool);
|
||||
virtual void goSignInputMode();
|
||||
virtual void changePredictLanguage();
|
||||
virtual void updateFixMode();
|
||||
#else
|
||||
virtual ~Base();
|
||||
virtual void create(MEMAllocator* allocator);
|
||||
virtual void init();
|
||||
virtual void setCommandReceiver(textinput::CommandReceiver*);
|
||||
virtual void updateFromReceiver(u32, void*);
|
||||
virtual void onKey();
|
||||
virtual void getType();
|
||||
virtual void setLanguage();
|
||||
virtual void getLanguage();
|
||||
virtual void update();
|
||||
virtual void onActive();
|
||||
virtual void inputCharCode();
|
||||
virtual void getState();
|
||||
virtual void isShiftOn();
|
||||
virtual void isCapsOn();
|
||||
virtual void isABC();
|
||||
virtual void setABC();
|
||||
virtual void getABCInputMode();
|
||||
virtual void getAIUInputMode();
|
||||
virtual TranslateMode getTranslateMode();
|
||||
virtual void setTranslateMode(TranslateMode);
|
||||
virtual void onlyQwerty();
|
||||
virtual void setLangKeyActive(bool);
|
||||
virtual void setInputModeJP();
|
||||
virtual void setInputModeCK();
|
||||
virtual void refreshState();
|
||||
virtual void changeABCInputMode();
|
||||
virtual void changeAIUInputMode();
|
||||
virtual void onClose();
|
||||
virtual void getWCCode();
|
||||
virtual void getControlKey();
|
||||
virtual void sendInputWChar();
|
||||
virtual void goSignInputMode();
|
||||
virtual void changePredictLanguage();
|
||||
virtual void updateFixMode();
|
||||
#endif
|
||||
virtual void inputCharCode(wchar_t wc) override;
|
||||
virtual void setABC(bool) override;
|
||||
virtual void setTranslateMode(TranslateMode mode) override;
|
||||
virtual void onlyQwerty(bool) override;
|
||||
virtual void setLangKeyActive(bool) override;
|
||||
virtual void setInputModeJP(bool, u32, u32) override;
|
||||
virtual void setInputModeCK(u32) override;
|
||||
virtual void refreshState() override;
|
||||
virtual void onClose() override;
|
||||
virtual void sendInputWChar(wchar_t wc, bool flag) override;
|
||||
virtual void goSignInputMode() override;
|
||||
virtual void changePredictLanguage() override;
|
||||
|
||||
#if defined(MYTIMANAGER_IMPLEMENTATION) || defined(TIINPUTFORM_IMPLEMENTATION)
|
||||
private:
|
||||
u8 mKeyboardInputFlags[8];
|
||||
const void* mpKeyStateTable;
|
||||
u32 mTranslateMode;
|
||||
u32 mABCInputMode;
|
||||
u32 mAIUInputMode;
|
||||
u32 mCurrentInputType;
|
||||
u32 mInputState;
|
||||
const void* mpLanguageData;
|
||||
#ifdef TIINPUTFORM_IMPLEMENTATION
|
||||
MEMAllocator* mpAllocator;
|
||||
#endif
|
||||
bool mbOnlyQwerty;
|
||||
bool mbLanguageKeyActive;
|
||||
u16 mKeyboardFlags;
|
||||
void* mpInputSettings;
|
||||
void* mpCurrentKeyState;
|
||||
virtual void draw(); // 0x11C
|
||||
virtual void calc(); // 0x120
|
||||
virtual void setPredictLanguageDialog(predictlang::LayoutByNW4R* dialog); // 0x124
|
||||
virtual void setSignWindow(signwindow::LayoutByNW4R* window); // 0x128
|
||||
virtual void setLineFeedButton(bool); // 0x12C
|
||||
virtual void setPredictLanguageButton(bool); // 0x130
|
||||
virtual void setSignWindowButton(bool); // 0x134
|
||||
virtual bool updateInput(int chan, f32 x, f32 y, u32 trig, u32 hold, u32 release, void* data); // 0x138
|
||||
virtual bool updateInput(textinput::input::HKBManager& hkbManager); // 0x13C
|
||||
virtual void changeAnimationAllToNormal(); // 0x140
|
||||
virtual void throwReleaseForAll(); // 0x144
|
||||
virtual void cancelStateFocusIn(); // 0x148
|
||||
virtual void updatePredictLanguage(CommandReceiver::ChangePredictMode* mode); // 0x14C
|
||||
virtual void updateDakuten(); // 0x150
|
||||
virtual void initLayout(); // 0x154
|
||||
virtual void onEvent(UIObj* uiObj, u32, void*); // 0x158
|
||||
|
||||
public:
|
||||
#ifdef TIINPUTFORM_IMPLEMENTATION
|
||||
bool isQwertyOnly() const { return mbOnlyQwerty; }
|
||||
bool isLanguageKeyActive() const { return mbLanguageKeyActive; }
|
||||
#endif
|
||||
u32 getTranslateModeForMemo() const { return mTranslateMode; }
|
||||
u32 getABCInputModeForMemo() const { return mABCInputMode; }
|
||||
u32 getAIUInputModeForMemo() const { return mAIUInputMode; }
|
||||
#endif
|
||||
};
|
||||
|
||||
// TODO
|
||||
class LayoutByNW4R : public Base, public nw4rmanager::Layout
|
||||
#if defined(MYTIMANAGER_IMPLEMENTATION) || defined(TIINPUTFORM_IMPLEMENTATION)
|
||||
, public UIObj::Listener
|
||||
#endif
|
||||
{
|
||||
public:
|
||||
// TODO - ...
|
||||
|
||||
#if defined(MYTIMANAGER_IMPLEMENTATION) || defined(TIINPUTFORM_IMPLEMENTATION)
|
||||
virtual void draw();
|
||||
virtual void calc();
|
||||
virtual void setPredictLanguageDialog(void*);
|
||||
virtual void setSignWindow(void*);
|
||||
virtual void setLineFeedButton(bool);
|
||||
virtual void setPredictLanguageButton(bool);
|
||||
virtual void setSignWindowButton(bool);
|
||||
#endif
|
||||
virtual void onClose();
|
||||
|
||||
void onPressedShift(bool shift);
|
||||
void createAnmPane_(MEMAllocator* allocator);
|
||||
void onPressedCaps();
|
||||
void onPressedShift(bool);
|
||||
void onReleasedShift();
|
||||
#ifdef TIINPUTFORM_IMPLEMENTATION
|
||||
bool hasLineFeedButton() const { return mbLineFeedButton; }
|
||||
|
||||
private:
|
||||
void* mpPredictLanguageDialog;
|
||||
void* mpSignWindow;
|
||||
bool mbLineFeedButton;
|
||||
public:
|
||||
#endif
|
||||
#if defined(MYTIMANAGER_IMPLEMENTATION) || defined(TIINPUTFORM_IMPLEMENTATION)
|
||||
virtual bool updateInput(int chan, f32 x, f32 y, u32 trig, u32 hold, u32 release, void* data) override;
|
||||
virtual bool updateInput(input::HKBManager& hkbManager) override;
|
||||
#endif
|
||||
EventHandler* mpEventHandler; // 0xF0
|
||||
predictlang::LayoutByNW4R* mpPredictLanguageDialog; // 0xF4
|
||||
signwindow::LayoutByNW4R* mpSignWindow; // 0xF8
|
||||
bool mbLineFeed; // 0xFC
|
||||
u8 unk_0xFD[3]; // 0xFD
|
||||
UIModifierButton mShiftButton; // 0x100
|
||||
UIModifierButton mCapsButton; // 0x124
|
||||
UIModePanel mModePanel; // 0x148
|
||||
};
|
||||
|
||||
#ifdef TI_PCTYPE_SAMPLE_CLASS
|
||||
class Sample : public LayoutByNW4R {
|
||||
public:
|
||||
Sample(Manager* manager, nw4r::lyt::MultiArcResourceAccessor* resAccessor, const char* arcName, EventObserver* observer)
|
||||
: LayoutByNW4R(manager, resAccessor, arcName, observer) {}
|
||||
virtual ~Sample();
|
||||
};
|
||||
#else
|
||||
class Sample {};
|
||||
#endif
|
||||
|
||||
} // namespace pctype
|
||||
|
||||
} // namespace keyboard
|
||||
|
||||
} // namespace textinput
|
||||
|
||||
#endif
|
||||
#endif // TEXTINPUT_HW_KEYBOARD_H
|
||||
#endif // TEXTINPUT_PC_KEYBOARD_H
|
||||
|
||||
@@ -14,17 +14,13 @@ namespace textinput {
|
||||
|
||||
class Base : public CommandSender {
|
||||
public:
|
||||
#if defined(TI_PREDICTLANG_SAMPLE_CLASS) || defined(TIMANAGER_IMPLEMENTATION)
|
||||
#ifdef TI_PREDICTLANG_SAMPLE_CLASS
|
||||
Base(Manager* manager) : mePredictMode(inputform::Base::PM_USEn), mpAllocator(NULL), mpManager(manager) {}
|
||||
#endif
|
||||
|
||||
#ifdef TIMANAGER_IMPLEMENTATION
|
||||
virtual ~Base();
|
||||
virtual void init();
|
||||
virtual void create(MEMAllocator* allocator) override;
|
||||
#else
|
||||
virtual ~Base() {}
|
||||
virtual void create(MEMAllocator* allocator) override { mpAllocator = allocator; }
|
||||
#endif
|
||||
virtual void init();
|
||||
virtual void setPredictMode(inputform::Base::PredictMode mode) { mePredictMode = mode; }
|
||||
|
||||
protected:
|
||||
@@ -38,20 +34,16 @@ namespace textinput {
|
||||
|
||||
class LayoutByNW4R : public Base, public nw4rmanager::Layout, public nw4rmanager::AnmObserver {
|
||||
public:
|
||||
#ifdef TIMANAGER_IMPLEMENTATION
|
||||
LayoutByNW4R(Manager* manager, nw4r::lyt::MultiArcResourceAccessor* resAccessor, EventObserver* observer, const char* layoutName)
|
||||
: Base(manager), nw4rmanager::Layout(resAccessor, layoutName, observer), mbActive(false), mbInput(false),
|
||||
mpEventHandler(NULL), meDestination(DST_US), mpCaller(NULL) {}
|
||||
#elif defined(TI_PREDICTLANG_SAMPLE_CLASS)
|
||||
LayoutByNW4R(Manager* manager, nw4r::lyt::MultiArcResourceAccessor* resAccessor, EventObserver* observer)
|
||||
: Base(manager), nw4rmanager::Layout(resAccessor, "fs_prdicSelWidw_a.brlyt", observer), mbActive(false), mbInput(false),
|
||||
#ifdef TI_PREDICTLANG_SAMPLE_CLASS
|
||||
LayoutByNW4R(Manager* manager, nw4r::lyt::MultiArcResourceAccessor* resAccessor, const char* arcName, EventObserver* observer)
|
||||
: Base(manager), nw4rmanager::Layout(resAccessor, arcName, observer), mbActive(false), mbInput(false),
|
||||
mpEventHandler(NULL), meDestination(DST_US), mpCaller(NULL) {}
|
||||
#endif
|
||||
|
||||
virtual ~LayoutByNW4R();
|
||||
virtual void create(MEMAllocator* allocator) override;
|
||||
virtual void init() override;
|
||||
virtual void draw() override;
|
||||
virtual void init() override;
|
||||
|
||||
virtual void open(inputform::Base::PredictMode predictMode, keyboard::KeyboardBase* keyboard);
|
||||
virtual void endToOpen();
|
||||
@@ -78,21 +70,12 @@ namespace textinput {
|
||||
keyboard::KeyboardBase* mpCaller; // 0xD4
|
||||
};
|
||||
|
||||
#if defined(TI_PREDICTLANG_SAMPLE_CLASS) || defined(TIMANAGER_IMPLEMENTATION)
|
||||
#ifdef TI_PREDICTLANG_SAMPLE_CLASS
|
||||
class Sample : public LayoutByNW4R {
|
||||
public:
|
||||
#ifdef TIMANAGER_IMPLEMENTATION
|
||||
Sample(Manager* manager, nw4r::lyt::MultiArcResourceAccessor* resAccessor, EventObserver* observer, const char* layoutName)
|
||||
: LayoutByNW4R(manager, resAccessor, observer, layoutName) {}
|
||||
#else
|
||||
Sample(Manager* manager, nw4r::lyt::MultiArcResourceAccessor* resAccessor, EventObserver* observer)
|
||||
: LayoutByNW4R(manager, resAccessor, observer) {}
|
||||
#endif
|
||||
#ifdef TIMANAGER_IMPLEMENTATION
|
||||
virtual ~Sample();
|
||||
#else
|
||||
Sample(Manager* manager, nw4r::lyt::MultiArcResourceAccessor* resAccessor, const char* arcName, EventObserver* observer)
|
||||
: LayoutByNW4R(manager, resAccessor, arcName, observer) {}
|
||||
virtual ~Sample() {}
|
||||
#endif
|
||||
};
|
||||
#endif
|
||||
|
||||
|
||||
@@ -7,7 +7,13 @@ namespace textinput {
|
||||
namespace extend {
|
||||
namespace savedata {
|
||||
typedef struct MemoSetting {
|
||||
u8 uRevisionAndType; // 0x00
|
||||
union {
|
||||
u8 uRevisionAndType; // 0x00
|
||||
struct {
|
||||
u8 uType : 4; // 0x00:11110000
|
||||
u8 uRevision : 4; // 0x00:00001111
|
||||
};
|
||||
};
|
||||
|
||||
union {
|
||||
struct {
|
||||
|
||||
@@ -3,132 +3,152 @@
|
||||
|
||||
#include "tiKeyboard.h"
|
||||
#include "tiNw4rManager.h"
|
||||
#include "tiTextInputBase.h"
|
||||
#include "tiSwData.h"
|
||||
|
||||
namespace textinput {
|
||||
class Manager;
|
||||
namespace keyboard {
|
||||
class Manager;
|
||||
|
||||
namespace signwindow {
|
||||
|
||||
struct LanguageDependency {
|
||||
u8 count;
|
||||
const PaneNameToCharCodeInSignMode* keys;
|
||||
};
|
||||
|
||||
class Base : public KeyboardBase {
|
||||
public:
|
||||
virtual ~Base();
|
||||
virtual void create(MEMAllocator*) override;
|
||||
virtual void init() override;
|
||||
virtual void onKey(u32, void*) override;
|
||||
virtual bool isLocked();
|
||||
virtual void setPage(u8);
|
||||
virtual u8 getPage();
|
||||
virtual void movePrevSignPage();
|
||||
virtual void moveNextSignPage();
|
||||
virtual void close();
|
||||
virtual int getType() override;
|
||||
virtual void setLanguage(Language) override;
|
||||
|
||||
protected:
|
||||
u8 mInputFlags;
|
||||
bool mbLocked;
|
||||
bool mbRepeat;
|
||||
u8 muPage;
|
||||
const LanguageDependency* mpLanguageDependency;
|
||||
MEMAllocator* mpAllocator;
|
||||
Manager* mpManager;
|
||||
};
|
||||
|
||||
class EventHandler;
|
||||
|
||||
class LayoutByNW4R : public Base, public nw4rmanager::Layout, public nw4rmanager::AnmObserver {
|
||||
public:
|
||||
virtual ~LayoutByNW4R();
|
||||
virtual void create(MEMAllocator*) override;
|
||||
virtual void init() override;
|
||||
virtual void onKey(u32, void*) override;
|
||||
virtual void movePrevSignPage() override;
|
||||
virtual void moveNextSignPage() override;
|
||||
virtual void close() override;
|
||||
virtual void draw() override;
|
||||
virtual void open(KeyboardBase*, bool);
|
||||
virtual bool isActive();
|
||||
virtual void onChangeAnmState(AnmEvent, nw4rmanager::AnmPane*, nw4rmanager::Anim*) override;
|
||||
virtual bool updateInput(int, f32, f32, u32, u32, u32, void*) override;
|
||||
virtual bool updateInput(input::HKBManager&) override;
|
||||
virtual void throwReleaseForAll();
|
||||
virtual void resetAnmSignWindow();
|
||||
virtual void setSignKeyTop(u16, u16);
|
||||
virtual void setPageNumber(u16);
|
||||
virtual void endToClose();
|
||||
virtual void startToInput();
|
||||
virtual void movePrevSignWindow();
|
||||
virtual void moveNextSignWindow();
|
||||
|
||||
bool mbActive;
|
||||
bool mbInput;
|
||||
EventHandler* mpEventHandler;
|
||||
KeyboardBase* mpKeyboard;
|
||||
};
|
||||
|
||||
class Sample : public LayoutByNW4R {
|
||||
public:
|
||||
virtual ~Sample();
|
||||
};
|
||||
|
||||
class EventHandler : public nw4rmanager::TiEventHandler {
|
||||
public:
|
||||
explicit EventHandler(LayoutByNW4R* layout) : mpLayoutByNW4R(layout) {}
|
||||
virtual ~EventHandler();
|
||||
virtual void onTiEvent(gui::PaneComponent*, u32, Input*) override;
|
||||
LayoutByNW4R* mpLayoutByNW4R;
|
||||
};
|
||||
|
||||
class AnmPane : public nw4rmanager::AnmPane {
|
||||
public:
|
||||
AnmPane(nw4r::lyt::Pane* pane, nw4rmanager::AnmObserver* observer)
|
||||
: nw4rmanager::AnmPane(pane, observer), muAnimation(0) {}
|
||||
inline virtual ~AnmPane();
|
||||
virtual void init() override;
|
||||
virtual void changeAnimation(u32) override;
|
||||
virtual u32 getKeyType() const;
|
||||
|
||||
protected:
|
||||
s32 muAnimation;
|
||||
u32 muKeyType;
|
||||
};
|
||||
|
||||
class CellPhoneSignAllAnmPane : public AnmPane {
|
||||
public:
|
||||
CellPhoneSignAllAnmPane(nw4r::lyt::Pane* pane, nw4rmanager::AnmObserver* observer)
|
||||
: AnmPane(pane, observer) { muKeyType = 0; }
|
||||
virtual ~CellPhoneSignAllAnmPane();
|
||||
virtual void init() override;
|
||||
virtual void onAnmEvent(AnmPaneEvent) override;
|
||||
};
|
||||
|
||||
class CellPhoneSignScrollAnmPane : public AnmPane {
|
||||
public:
|
||||
CellPhoneSignScrollAnmPane(nw4r::lyt::Pane* pane, nw4rmanager::AnmObserver* observer)
|
||||
: AnmPane(pane, observer) { muKeyType = 1; }
|
||||
virtual ~CellPhoneSignScrollAnmPane();
|
||||
virtual void init() override;
|
||||
virtual void onAnmEvent(AnmPaneEvent) override;
|
||||
};
|
||||
|
||||
class CellPhoneSignButtonPane : public AnmPane {
|
||||
public:
|
||||
CellPhoneSignButtonPane(nw4r::lyt::Pane* pane, nw4rmanager::AnmObserver* observer)
|
||||
: AnmPane(pane, observer) { muKeyType = 2; }
|
||||
virtual ~CellPhoneSignButtonPane();
|
||||
virtual void init() override;
|
||||
virtual void onAnmEvent(AnmPaneEvent) override;
|
||||
};
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
namespace keyboard {
|
||||
namespace signwindow {
|
||||
struct LanguageDependency {
|
||||
u8 count;
|
||||
const PaneNameToCharCodeInSignMode* keys;
|
||||
};
|
||||
|
||||
class Base : public KeyboardBase {
|
||||
public:
|
||||
#ifdef TI_SIGNWINDOW_SAMPLE_CLASS
|
||||
Base(Manager* manager) : mpAllocator(NULL), mpManager(manager) {}
|
||||
#endif
|
||||
|
||||
virtual ~Base();
|
||||
virtual void create(MEMAllocator* allocator) override;
|
||||
virtual void init() override;
|
||||
virtual void onKey(u32, void*);
|
||||
virtual int getType();
|
||||
virtual void setLanguage(Language language) override;
|
||||
virtual bool isLocked(); // 0x38
|
||||
virtual void setPage(u8 page); // 0x3C
|
||||
virtual u8 getPage(); // 0x40
|
||||
virtual void movePrevSignPage(); // 0x44
|
||||
virtual void moveNextSignPage(); // 0x48
|
||||
virtual void close(); // 0x4C
|
||||
|
||||
protected:
|
||||
u8 mInputFlags; // 0x14
|
||||
bool mbLocked; // 0x15
|
||||
bool mbRepeat; // 0x16
|
||||
u8 muPage; // 0x17
|
||||
const LanguageDependency* mpLanguageDependency; // 0x18
|
||||
MEMAllocator* mpAllocator; // 0x1C
|
||||
Manager* mpManager; // 0x20
|
||||
};
|
||||
|
||||
class AnmPane;
|
||||
class EventHandler;
|
||||
|
||||
class LayoutByNW4R : public Base, public nw4rmanager::Layout, public nw4rmanager::AnmObserver {
|
||||
public:
|
||||
#ifdef TI_SIGNWINDOW_SAMPLE_CLASS
|
||||
LayoutByNW4R(Manager* manager, nw4r::lyt::MultiArcResourceAccessor* resAccessor, const char* arcName, EventObserver* observer)
|
||||
: Base(manager), nw4rmanager::Layout(resAccessor, arcName, observer), mbActive(false), mbInput(false),
|
||||
mpEventHandler(NULL), mpKeyboard(NULL) {}
|
||||
#endif
|
||||
|
||||
virtual ~LayoutByNW4R();
|
||||
virtual void create(MEMAllocator* allocator) override;
|
||||
virtual void init() override;
|
||||
virtual void onKey(u32, void*) override;
|
||||
virtual void movePrevSignPage() override; // 0x44
|
||||
virtual void moveNextSignPage() override; // 0x48
|
||||
virtual void close() override; // 0x4C
|
||||
|
||||
virtual void draw(); // 0xD4
|
||||
virtual void open(KeyboardBase* keyboard, bool flag); // 0xD8
|
||||
virtual bool isActive(); // 0xDC
|
||||
virtual void onChangeAnmState(nw4rmanager::AnmObserver::AnmEvent anmEvent,
|
||||
nw4rmanager::AnmPane* anmPane, nw4rmanager::Anim* anim); // 0xE0
|
||||
virtual bool updateInput(int chan, f32 x, f32 y, u32 trig, u32 hold, u32 release, void* data); // 0xE4
|
||||
virtual bool updateInput(textinput::input::HKBManager& hkbManager); // 0xE8
|
||||
virtual void throwReleaseForAll(); // 0xEC
|
||||
virtual void resetAnmSignWindow(); // 0xF0
|
||||
virtual void setSignKeyTop(u16, u16); // 0xF4
|
||||
virtual void setPageNumber(u16); // 0xF8
|
||||
virtual void endToClose(); // 0xFC
|
||||
virtual void startToInput(); // 0x100
|
||||
virtual void movePrevSignWindow(); // 0x104
|
||||
virtual void moveNextSignWindow(); // 0x108
|
||||
|
||||
private:
|
||||
bool mbActive; // 0xD0
|
||||
bool mbInput; // 0xD1
|
||||
EventHandler* mpEventHandler; // 0xD4
|
||||
KeyboardBase* mpKeyboard; // 0xD8
|
||||
};
|
||||
|
||||
#ifdef TI_SIGNWINDOW_SAMPLE_CLASS
|
||||
class Sample : public LayoutByNW4R {
|
||||
public:
|
||||
Sample(Manager* manager, nw4r::lyt::MultiArcResourceAccessor* resAccessor, const char* arcName, EventObserver* observer)
|
||||
: LayoutByNW4R(manager, resAccessor, arcName, observer) {}
|
||||
virtual ~Sample();
|
||||
};
|
||||
#else
|
||||
class Sample {};
|
||||
#endif
|
||||
|
||||
class EventHandler : public nw4rmanager::TiEventHandler {
|
||||
public:
|
||||
explicit EventHandler(LayoutByNW4R* layout) : mpLayoutByNW4R(layout) {}
|
||||
virtual ~EventHandler();
|
||||
virtual void onTiEvent(gui::PaneComponent*, u32, Input*) override;
|
||||
LayoutByNW4R* mpLayoutByNW4R;
|
||||
};
|
||||
|
||||
class AnmPane : public nw4rmanager::AnmPane {
|
||||
public:
|
||||
AnmPane(nw4r::lyt::Pane* pane, nw4rmanager::AnmObserver* observer)
|
||||
: nw4rmanager::AnmPane(pane, observer), muAnimation(0) {}
|
||||
inline virtual ~AnmPane();
|
||||
virtual void init() override;
|
||||
virtual void changeAnimation(u32) override;
|
||||
virtual u32 getKeyType() const;
|
||||
|
||||
protected:
|
||||
s32 muAnimation;
|
||||
u32 muKeyType;
|
||||
};
|
||||
|
||||
class CellPhoneSignAllAnmPane : public AnmPane {
|
||||
public:
|
||||
CellPhoneSignAllAnmPane(nw4r::lyt::Pane* pane, nw4rmanager::AnmObserver* observer)
|
||||
: AnmPane(pane, observer) { muKeyType = 0; }
|
||||
virtual ~CellPhoneSignAllAnmPane();
|
||||
virtual void init() override;
|
||||
virtual void onAnmEvent(AnmPaneEvent) override;
|
||||
};
|
||||
|
||||
class CellPhoneSignScrollAnmPane : public AnmPane {
|
||||
public:
|
||||
CellPhoneSignScrollAnmPane(nw4r::lyt::Pane* pane, nw4rmanager::AnmObserver* observer)
|
||||
: AnmPane(pane, observer) { muKeyType = 1; }
|
||||
virtual ~CellPhoneSignScrollAnmPane();
|
||||
virtual void init() override;
|
||||
virtual void onAnmEvent(AnmPaneEvent) override;
|
||||
};
|
||||
|
||||
class CellPhoneSignButtonPane : public AnmPane {
|
||||
public:
|
||||
CellPhoneSignButtonPane(nw4r::lyt::Pane* pane, nw4rmanager::AnmObserver* observer)
|
||||
: AnmPane(pane, observer) { muKeyType = 2; }
|
||||
virtual ~CellPhoneSignButtonPane();
|
||||
virtual void init() override;
|
||||
virtual void onAnmEvent(AnmPaneEvent) override;
|
||||
};
|
||||
|
||||
} // namespace signwindow
|
||||
} // namespace keyboard
|
||||
} // namespace textinput
|
||||
|
||||
#endif // TEXTINPUT_SIGN_WINDOW_H
|
||||
|
||||
@@ -3,9 +3,7 @@
|
||||
|
||||
#include <revolution/types.h>
|
||||
#include <revolution/mem/allocator.h>
|
||||
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION) || defined(TISTRING_IMPLEMENTATION) || defined(TIZISTRING_IMPLEMENTATION)
|
||||
#include <revolution/kpr.h>
|
||||
#endif
|
||||
|
||||
namespace textinput {
|
||||
namespace tistring {
|
||||
@@ -36,23 +34,15 @@ namespace textinput {
|
||||
|
||||
virtual void setLength(u16);
|
||||
|
||||
virtual wchar_t* getWCString() const { return mpszString; }
|
||||
virtual wchar_t* getWCString() const;
|
||||
|
||||
virtual void setCandidate(wchar_t candidate) { mwcCandidate = candidate; }
|
||||
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION) || defined(TISTRING_IMPLEMENTATION) || defined(TIZISTRING_IMPLEMENTATION)
|
||||
virtual wchar_t getCandidate() const { return mwcCandidate; }
|
||||
#else
|
||||
virtual wchar_t getCandidate() { return mwcCandidate; }
|
||||
#endif
|
||||
virtual bool hasCandidate() const;
|
||||
|
||||
virtual wchar_t getLastWChar();
|
||||
|
||||
#if defined(TISTRING_IMPLEMENTATION) || defined(TIZISTRING_IMPLEMENTATION)
|
||||
protected:
|
||||
#else
|
||||
private:
|
||||
#endif
|
||||
u16 muMaxLength; // 0x04
|
||||
u16 muLength; // 0x06
|
||||
|
||||
@@ -65,56 +55,41 @@ namespace textinput {
|
||||
};
|
||||
|
||||
class KanaStream {
|
||||
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION) || defined(TISTRING_IMPLEMENTATION) || defined(TIZISTRING_IMPLEMENTATION)
|
||||
public:
|
||||
KPRQueue mQueue;
|
||||
wchar_t mPending;
|
||||
wchar_t mOutput[5];
|
||||
#else
|
||||
private:
|
||||
u8 field_0x00[0x24];
|
||||
#endif
|
||||
};
|
||||
|
||||
class Decolated : public StringBase {
|
||||
public:
|
||||
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION) || defined(TISTRING_IMPLEMENTATION) || defined(TIZISTRING_IMPLEMENTATION)
|
||||
Decolated(u16 maxLen) : StringBase(maxLen), mCursorStart(0), mCursorEnd(0), mbSustain(false), mTranslateMode(0) { initKanaConverter(); }
|
||||
#else
|
||||
Decolated(u16 maxLen) : StringBase(maxLen), field_0x18(0), field_0x1C(0), field_0x20(0), field_0x24(0) { initKanaConverter(); }
|
||||
#endif
|
||||
|
||||
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION) || defined(TISTRING_IMPLEMENTATION) || defined(TIZISTRING_IMPLEMENTATION)
|
||||
virtual ~Decolated();
|
||||
enum TranslateMode { TM_Direct, TM_Kana, TM_Roman, TM_Hangul };
|
||||
|
||||
Decolated(u16 maxLen) : StringBase(maxLen), mCursorStart(0), mCursorEnd(0), mbSustain(false), mTranslateMode(0) { initKanaConverter(); }
|
||||
virtual ~Decolated();
|
||||
|
||||
virtual void clear();
|
||||
virtual void set(const wchar_t* string);
|
||||
virtual void setLength(u16 length);
|
||||
void setTranslateMode(TranslateMode mode);
|
||||
TranslateMode getTranslateMode() const { return static_cast<TranslateMode>(mTranslateMode); }
|
||||
void inputString(const wchar_t* string, TranslateMode mode);
|
||||
virtual void inputChar(wchar_t ch);
|
||||
virtual void inputString(const wchar_t* string);
|
||||
virtual void setLength(u16);
|
||||
|
||||
virtual void inputChar(wchar_t);
|
||||
virtual void inputString(const wchar_t*);
|
||||
virtual void deleteChar();
|
||||
virtual void backSpace();
|
||||
virtual void confirm(const wchar_t* string);
|
||||
virtual void confirm(const wchar_t*);
|
||||
virtual bool moveCursorRight();
|
||||
virtual bool moveCursorLeft();
|
||||
virtual void setCursorPos(u32 pos);
|
||||
virtual void setCursorPos(u32);
|
||||
virtual void onSustain();
|
||||
virtual void offSustain();
|
||||
virtual bool isOnSustain();
|
||||
virtual u32 getCursorPos() const;
|
||||
virtual void getCursorPos(u32* start, u32* end);
|
||||
virtual void getCursorPos(u32*, u32*);
|
||||
virtual bool canBackSpace();
|
||||
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION) || defined(TISTRING_IMPLEMENTATION) || defined(TIZISTRING_IMPLEMENTATION)
|
||||
virtual bool deleteForward();
|
||||
#else
|
||||
virtual void deleteForward();
|
||||
#endif
|
||||
virtual void getSelected(u32& start, u32& end);
|
||||
virtual void getSelected(u32&, u32&);
|
||||
virtual wchar_t getWCharAtCursor();
|
||||
virtual void replaceAtCursor(wchar_t ch);
|
||||
virtual void replaceAtCursor(wchar_t);
|
||||
virtual bool isDakuten();
|
||||
virtual void converDakuten();
|
||||
virtual bool isHandaku();
|
||||
@@ -124,123 +99,68 @@ namespace textinput {
|
||||
virtual void converSmall();
|
||||
virtual bool atTheBeginningOfASentence();
|
||||
virtual void initKanaConverter();
|
||||
virtual wchar_t* getKanaBuffer();
|
||||
virtual void* getKanaBuffer();
|
||||
virtual bool isKanaFix() const;
|
||||
virtual void confirmKana();
|
||||
virtual void clearKana();
|
||||
virtual void EnableKSXFilter(bool enable);
|
||||
#else
|
||||
virtual void inputChar();
|
||||
virtual void inputString();
|
||||
virtual void deleteChar();
|
||||
virtual void backSpace();
|
||||
virtual void confirm();
|
||||
virtual void moveCursorRight();
|
||||
virtual void moveCursorLeft();
|
||||
virtual void setCursorPos();
|
||||
virtual void onSustain();
|
||||
virtual void offSustain();
|
||||
virtual void isOnSustain();
|
||||
virtual void getCursorPos();
|
||||
virtual void getCursorPos(u32*, u32*);
|
||||
virtual void canBackSpace();
|
||||
virtual void deleteForward();
|
||||
virtual void getSelected();
|
||||
virtual void getWCharAtCursor();
|
||||
virtual void replaceAtCursor();
|
||||
virtual void isDakuten();
|
||||
virtual void converDakuten();
|
||||
virtual void isHandaku();
|
||||
virtual void converHandaku();
|
||||
virtual void convertAll();
|
||||
virtual void isSmall();
|
||||
virtual void converSmall();
|
||||
virtual bool atTheBeginningOfASentence();
|
||||
virtual void initKanaConverter();
|
||||
virtual void getKanaBuffer();
|
||||
virtual void isKanaFix();
|
||||
virtual void confirmKana();
|
||||
virtual void clearKana();
|
||||
virtual void EnableKSXFilter();
|
||||
virtual void EnableKSXFilter(bool);
|
||||
|
||||
#endif
|
||||
void setTranslateMode(TranslateMode mode);
|
||||
TranslateMode getTranslateMode() const { return static_cast<TranslateMode>(mTranslateMode); }
|
||||
void inputString(const wchar_t* string, TranslateMode mode);
|
||||
|
||||
#if defined(TISTRING_IMPLEMENTATION) || defined(TIZISTRING_IMPLEMENTATION)
|
||||
protected:
|
||||
#else
|
||||
private:
|
||||
#endif
|
||||
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION) || defined(TISTRING_IMPLEMENTATION) || defined(TIZISTRING_IMPLEMENTATION)
|
||||
u32 mCursorStart;
|
||||
u32 mCursorEnd;
|
||||
#if defined(TISTRING_IMPLEMENTATION) || defined(TIZISTRING_IMPLEMENTATION)
|
||||
u8 mbSustain;
|
||||
s32 mTranslateMode;
|
||||
#else
|
||||
bool mbSustain;
|
||||
u32 mTranslateMode;
|
||||
#endif
|
||||
#else
|
||||
u32 field_0x18; // 0x18
|
||||
u32 field_0x1C; // 0x1C
|
||||
u8 field_0x20; // 0x20
|
||||
u32 field_0x24; // 0x24
|
||||
#endif
|
||||
u32 mCursorStart; // 0x18
|
||||
u32 mCursorEnd; // 0x1C
|
||||
u8 mbSustain; // 0x20
|
||||
s32 mTranslateMode; // 0x24
|
||||
KanaStream mKanaStream; // 0x28
|
||||
};
|
||||
|
||||
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION) || defined(TISTRING_IMPLEMENTATION) || defined(TIZISTRING_IMPLEMENTATION)
|
||||
class WithAtok : public Decolated {
|
||||
public:
|
||||
WithAtok(u16 maxLength) : Decolated(maxLength) {}
|
||||
virtual ~WithAtok();
|
||||
struct DrawInfo;
|
||||
|
||||
~WithAtok();
|
||||
|
||||
virtual void pushBack(wchar_t ch);
|
||||
virtual void popBack();
|
||||
virtual void inputChar(wchar_t ch);
|
||||
virtual void inputChar(wchar_t);
|
||||
virtual void backSpace();
|
||||
virtual void confirm(const wchar_t* string);
|
||||
virtual void confirm(const wchar_t*);
|
||||
virtual bool moveCursorRight();
|
||||
virtual bool moveCursorLeft();
|
||||
virtual void getCursorPos(u32* start, u32* end);
|
||||
struct DrawInfo {
|
||||
const wchar_t* string;
|
||||
u32 start;
|
||||
u32 end;
|
||||
u32 selectedStart;
|
||||
u32 selectedEnd;
|
||||
};
|
||||
virtual void getCursorPos(u32*, u32*);
|
||||
|
||||
virtual bool isFix();
|
||||
virtual void setFix(bool fix);
|
||||
virtual void setFix(bool);
|
||||
virtual void initConverting();
|
||||
virtual bool isConverting();
|
||||
virtual wchar_t* getConfirmedWCString() const;
|
||||
virtual int getCurrentNumPredicted();
|
||||
virtual void getPredicted(int index, wchar_t* string);
|
||||
virtual void commitPredicted(int index);
|
||||
virtual void setSelectedCandidate(s32 index);
|
||||
virtual bool getPredicted(int, wchar_t*);
|
||||
virtual void commitPredicted(int);
|
||||
virtual void setSelectedCandidate(long);
|
||||
virtual bool isCandidateSelected();
|
||||
virtual s32 getSelectedCandidate();
|
||||
virtual int getSelectedCandidate();
|
||||
virtual void init();
|
||||
virtual void setInputting(wchar_t ch);
|
||||
virtual void getDrawString(DrawInfo& info);
|
||||
virtual void openDictionary(void* atok, int atokSize, void* apot, int apotSize, void* nintendo, int nintendoSize);
|
||||
virtual void setInputting(wchar_t);
|
||||
virtual void getDrawString(DrawInfo&);
|
||||
virtual void openDictionary(void*, int, void*, int, void*, int);
|
||||
virtual void closeDictionary();
|
||||
virtual bool hasConfirmedString();
|
||||
virtual void enableConfirmedString(bool enable);
|
||||
virtual void enableConfirmedString(bool);
|
||||
virtual void startConverting();
|
||||
virtual bool isDictionaryOpened();
|
||||
virtual void changeKanaMode(bool kana);
|
||||
virtual wchar_t getInputStringLength();
|
||||
virtual void changeKanaMode(bool);
|
||||
virtual int getInputStringLength();
|
||||
virtual void resetRelation();
|
||||
virtual void setFixMode(bool fixed);
|
||||
virtual void setFixPrediction(int count, const char** predictions);
|
||||
virtual void setDefaultPrediction(int count, const char** predictions);
|
||||
virtual s16 getSelectedConverting();
|
||||
virtual s32 getFixedPredictionNum();
|
||||
virtual void setFixMode(bool);
|
||||
virtual void setFixPrediction(int, const char* const*);
|
||||
virtual void setDefaultPrediction(int, const char* const*);
|
||||
virtual int getSelectedConverting();
|
||||
virtual int getFixedPredictionNum();
|
||||
};
|
||||
#else
|
||||
class WithAtok : public StringBase {};
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -6,17 +6,10 @@
|
||||
|
||||
#include <nw4r/ut/CharWriter.h>
|
||||
#include <nw4r/ut/Rect.h>
|
||||
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION) || defined(TITEXTDRAWER_IMPLEMENTATION) || defined(MYTILETTERFORM_IMPLEMENTATION) || defined(MYTIINPUTFORM_IMPLEMENTATION)
|
||||
#include <string.h>
|
||||
#endif
|
||||
|
||||
namespace textinput {
|
||||
namespace textdrawer {
|
||||
#if defined(MYTIMANAGER_IMPLEMENTATION) || defined(MYTIINPUTFORM_IMPLEMENTATION) || defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION) || defined(TITEXTDRAWER_IMPLEMENTATION) || defined(MYTILETTERFORM_IMPLEMENTATION)
|
||||
class Base : public nw4r::ut::CharWriter {
|
||||
#else
|
||||
class Base : nw4r::ut::CharWriter {
|
||||
#endif
|
||||
public:
|
||||
typedef struct ViewPort {
|
||||
f32 xOrig; // 0x00
|
||||
@@ -34,23 +27,11 @@ namespace textinput {
|
||||
} CursorPos;
|
||||
|
||||
typedef struct DrawInfo {
|
||||
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION) || defined(TITEXTDRAWER_IMPLEMENTATION) || defined(MYTILETTERFORM_IMPLEMENTATION) || defined(MYTIINPUTFORM_IMPLEMENTATION)
|
||||
nw4r::ut::Rect rect;
|
||||
wchar_t character;
|
||||
#else
|
||||
u8 unk_0x00[32];
|
||||
#endif
|
||||
nw4r::ut::Rect rect; // 0x00
|
||||
wchar_t character; // 0x10
|
||||
u8 unk_0x12[6]; // 0x12
|
||||
} DrawInfo;
|
||||
|
||||
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION)
|
||||
Base() : mpDrawAllocator(NULL), mfViewX(0.0f), mfViewY(0.0f), mfViewWidth(0.0f), mfViewHeight(0.0f),
|
||||
mfVIWidth(640.0f), mbAspect4x3(false), mbDrawClipped(false), muLine(0), mfLineSpacing(0.0f),
|
||||
mfCharacterSpacing(0.0f), mfFontWidth(0.0f), mfFontHeight(0.0f), mfModifyStartY(0.0f), mfMinScrollY(0.0f),
|
||||
muDrawStartPos(0), muDrawEndPos(65535), mbSecretMode(false), muDrawModifyStartLine(0), muDrawModifyEndLine(0),
|
||||
muDrawModifyStartPos(0), muDrawModifyEndPos(0), muCachedStartPos(0), muCachedEndPos(0), mbDrawCache(false),
|
||||
mfCachedCursorX(0.0f), mfCachedCursorY(0.0f), mfDrawScrollY(0.0f), muCachedCursorPosition(0),
|
||||
mbCursorCache(false), mbMaintainCursorCache(true) { memset(&mCachedCursor, 0, sizeof(mCachedCursor)); }
|
||||
#endif
|
||||
virtual void create(MEMAllocator* allocator);
|
||||
virtual void draw(CursorPos* cursorPos);
|
||||
virtual void draw();
|
||||
@@ -72,7 +53,7 @@ namespace textinput {
|
||||
|
||||
virtual nw4r::math::VEC2 getScale() const = 0;
|
||||
|
||||
virtual void setSecretModeOn(bool secretMode) { mbSecretMode = secretMode; }
|
||||
virtual void setSecretModeOn(bool secretMode);
|
||||
|
||||
virtual void doBeforeDrawProcess(const wchar_t*, u32, const DrawInfo& drawInfo);
|
||||
virtual void doAfterDrawProcess(const wchar_t*, u32, const DrawInfo& drawInfo);
|
||||
@@ -94,116 +75,49 @@ namespace textinput {
|
||||
virtual u32 getEndPos() const;
|
||||
|
||||
// todo
|
||||
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION) || defined(TITEXTDRAWER_IMPLEMENTATION) || defined(MYTILETTERFORM_IMPLEMENTATION) || defined(MYTIINPUTFORM_IMPLEMENTATION)
|
||||
virtual void setDrawModifyScopeLine(s32 startLine, s32 endLine);
|
||||
virtual void setDrawCacheScopeLine(s32 startLine, s32 endLine);
|
||||
virtual void modifyCursorCache(s32 line, u32 position, f32 x, f32 y, f32 width, f32 height);
|
||||
#else
|
||||
virtual void setDrawModifyScopeLine();
|
||||
virtual void setDrawCacheScopeLine();
|
||||
virtual void modifyCursorCache();
|
||||
#endif
|
||||
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION) || defined(TITEXTDRAWER_IMPLEMENTATION) || defined(MYTILETTERFORM_IMPLEMENTATION) || defined(MYTIINPUTFORM_IMPLEMENTATION)
|
||||
virtual void setDrawModifyScopeLine(s32, s32);
|
||||
virtual void setDrawCacheScopeLine(s32, s32);
|
||||
virtual void modifyCursorCache(s32, u32, f32, f32, f32, f32);
|
||||
virtual bool isEnableCursorCache() const;
|
||||
#else
|
||||
virtual void isEnableCursorCache();
|
||||
#endif
|
||||
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION) || defined(TITEXTDRAWER_IMPLEMENTATION) || defined(MYTILETTERFORM_IMPLEMENTATION) || defined(MYTIINPUTFORM_IMPLEMENTATION)
|
||||
virtual u32 getDrawModifyStartLine() const;
|
||||
virtual u32 getDrawModifyEndLine() const;
|
||||
#else
|
||||
virtual void getDrawModifyStartLine();
|
||||
virtual void getDrawModifyEndLine();
|
||||
#endif
|
||||
virtual s32 getDrawModifyStartLine() const;
|
||||
virtual s32 getDrawModifyEndLine() const;
|
||||
virtual u32 getDrawCacheStartPos() const;
|
||||
virtual void dirtyDrawCache();
|
||||
virtual void dirtyCursorCache();
|
||||
|
||||
#ifdef TITEXTDRAWER_IMPLEMENTATION
|
||||
protected:
|
||||
const wchar_t* mpDrawString;
|
||||
ViewPort mSavedViewport;
|
||||
f32 mSavedProjection[7];
|
||||
nw4r::ut::Rect mProjectionRect;
|
||||
f32 mfVIWidth;
|
||||
bool mbAspect4x3;
|
||||
bool mbDrawClipped;
|
||||
s32 muLine;
|
||||
f32 mfLineSpacing;
|
||||
f32 mfCharacterSpacing;
|
||||
f32 mfFontWidth;
|
||||
f32 mfFontHeight;
|
||||
f32 mfModifyStartY;
|
||||
f32 mfMinScrollY;
|
||||
u32 muDrawStartPos;
|
||||
u32 muDrawEndPos;
|
||||
u32 muDrawCacheStartPos;
|
||||
bool mbSecretMode;
|
||||
s32 muDrawModifyStartLine;
|
||||
s32 muDrawModifyEndLine;
|
||||
s32 muDrawModifyStartPos;
|
||||
s32 muDrawModifyEndPos;
|
||||
u32 muCachedStartPos;
|
||||
u32 muCachedEndPos;
|
||||
bool mbDrawCache;
|
||||
f32 mfCachedCursorX;
|
||||
f32 mfCachedCursorY;
|
||||
f32 mfDrawScrollY;
|
||||
s32 mnCachedCursorLine;
|
||||
CursorPos mCachedCursor;
|
||||
bool mbCursorCache;
|
||||
bool mbMaintainCursorCache;
|
||||
#else
|
||||
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION) || defined(TITEXTDRAWER_IMPLEMENTATION) || defined(MYTILETTERFORM_IMPLEMENTATION)
|
||||
protected:
|
||||
MEMAllocator* mpDrawAllocator;
|
||||
u8 mDrawConfiguration[0x34];
|
||||
f32 mfViewX;
|
||||
f32 mfViewY;
|
||||
f32 mfViewWidth;
|
||||
f32 mfViewHeight;
|
||||
f32 mfVIWidth;
|
||||
bool mbAspect4x3;
|
||||
bool mbDrawClipped;
|
||||
u32 muLine;
|
||||
f32 mfLineSpacing;
|
||||
f32 mfCharacterSpacing;
|
||||
f32 mfFontWidth;
|
||||
f32 mfFontHeight;
|
||||
f32 mfModifyStartY;
|
||||
f32 mfMinScrollY;
|
||||
u32 muDrawStartPos;
|
||||
u32 muDrawEndPos;
|
||||
u32 muDrawCacheStartPos;
|
||||
#else
|
||||
private:
|
||||
u8 unk_0x50[0x78];
|
||||
#endif
|
||||
bool mbSecretMode; // 0xC8
|
||||
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION) || defined(TITEXTDRAWER_IMPLEMENTATION) || defined(MYTILETTERFORM_IMPLEMENTATION)
|
||||
u32 muDrawModifyStartLine;
|
||||
u32 muDrawModifyEndLine;
|
||||
u32 muDrawModifyStartPos;
|
||||
u32 muDrawModifyEndPos;
|
||||
u32 muCachedStartPos;
|
||||
u32 muCachedEndPos;
|
||||
bool mbDrawCache;
|
||||
f32 mfCachedCursorX;
|
||||
f32 mfCachedCursorY;
|
||||
f32 mfDrawScrollY;
|
||||
u32 muCachedCursorPosition;
|
||||
CursorPos mCachedCursor;
|
||||
bool mbCursorCache;
|
||||
bool mbMaintainCursorCache;
|
||||
#elif defined(MYTIINPUTFORM_IMPLEMENTATION)
|
||||
protected:
|
||||
u8 mDrawState[0x27];
|
||||
f32 mfDrawScrollY;
|
||||
u8 mDrawCacheState[0x14];
|
||||
#else
|
||||
u8 unk_0xCC[0x3C];
|
||||
#endif
|
||||
#endif
|
||||
const wchar_t* mpDrawString; // 0x50
|
||||
ViewPort mSavedViewport; // 0x54
|
||||
f32 mSavedProjection[7]; // 0x6C
|
||||
nw4r::ut::Rect mProjectionRect; // 0x88
|
||||
f32 mfVIWidth; // 0x98
|
||||
bool mbAspect4x3; // 0x9C
|
||||
bool mbDrawClipped; // 0x9D
|
||||
s32 muLine; // 0xA0
|
||||
f32 mfLineSpacing; // 0xA4
|
||||
f32 mfCharacterSpacing; // 0xA8
|
||||
f32 mfFontWidth; // 0xAC
|
||||
f32 mfFontHeight; // 0xB0
|
||||
f32 mfModifyStartY; // 0xB4
|
||||
f32 mfMinScrollY; // 0xB8
|
||||
u32 muDrawStartPos; // 0xBC
|
||||
u32 muDrawEndPos; // 0xC0
|
||||
u32 muDrawCacheStartPos; // 0xC4
|
||||
bool mbSecretMode; // 0xC8
|
||||
s32 muDrawModifyStartLine; // 0xCC
|
||||
s32 muDrawModifyEndLine; // 0xD0
|
||||
s32 muDrawModifyStartPos; // 0xD4
|
||||
s32 muDrawModifyEndPos; // 0xD8
|
||||
u32 muCachedStartPos; // 0xDC
|
||||
u32 muCachedEndPos; // 0xE0
|
||||
bool mbDrawCache; // 0xE4
|
||||
f32 mfCachedCursorX; // 0xE8
|
||||
f32 mfCachedCursorY; // 0xEC
|
||||
f32 mfDrawScrollY; // 0xF0
|
||||
s32 mnCachedCursorLine; // 0xF4
|
||||
CursorPos mCachedCursor; // 0xF8
|
||||
bool mbCursorCache; // 0x104
|
||||
bool mbMaintainCursorCache; // 0x105
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
@@ -39,10 +39,6 @@ namespace textinput {
|
||||
f32 y; // 0x08
|
||||
} Scroll;
|
||||
|
||||
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION)
|
||||
enum HVKCode { HVK_None = 0 };
|
||||
#endif
|
||||
|
||||
class Base {
|
||||
public :
|
||||
virtual ~Base() {}
|
||||
@@ -54,28 +50,23 @@ namespace textinput {
|
||||
class CommandSender;
|
||||
class CommandReceiver : public Base {
|
||||
public:
|
||||
#ifdef TI_CELLPHONE_IMPLEMENTATION
|
||||
struct ChangePredictMode;
|
||||
#endif
|
||||
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION)
|
||||
CommandReceiver() { clearSender(); }
|
||||
virtual ~CommandReceiver();
|
||||
#endif
|
||||
#if defined(MYTIINPUTFORM_IMPLEMENTATION) || defined(MYTILETTERFORM_IMPLEMENTATION) || defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION)
|
||||
struct Scroll {
|
||||
bool absY;
|
||||
f32 x;
|
||||
f32 y;
|
||||
};
|
||||
#endif
|
||||
typedef enum INPUT_COMMAND {
|
||||
IC_TRANSLATE_MODE = 6,
|
||||
INPUT_COMMAND_0 = 0,
|
||||
INPUT_COMMAND_37 = 37,
|
||||
} INPUT_COMMAND;
|
||||
|
||||
#if (defined(TI_PC_KEYBOARD_IMPLEMENTATION) || defined(TIHWKEYBOARD_IMPLEMENTATION)) || defined(TIMANAGER_IMPLEMENTATION) || defined(TISIGNWINDOW_IMPLEMENTATION)
|
||||
struct ChangePredictMode { u32 mode; bool enabled; };
|
||||
#endif
|
||||
typedef struct Scroll {
|
||||
bool absY; // 0x00
|
||||
f32 x; // 0x04
|
||||
f32 y; // 0x08
|
||||
} Scroll;
|
||||
|
||||
typedef struct ChangePredictMode {
|
||||
u32 muLanguage; // 0x00
|
||||
u8 mbPredictOn; // 0x04
|
||||
} ChangePredictMode;
|
||||
|
||||
virtual void clearSender();
|
||||
virtual void onCommand(INPUT_COMMAND command, void* data);
|
||||
virtual void addSender(CommandSender* cmdSend);
|
||||
@@ -89,13 +80,7 @@ namespace textinput {
|
||||
CommandSender() : mpCommandReceiver(NULL) {}
|
||||
|
||||
virtual void setCommandReceiver(CommandReceiver* cmdRecv);
|
||||
#if (defined(TI_PC_KEYBOARD_IMPLEMENTATION) || defined(TIHWKEYBOARD_IMPLEMENTATION)) || defined(TIMANAGER_IMPLEMENTATION)
|
||||
virtual void sendCommand(u32 command, void* data) {
|
||||
if (mpCommandReceiver != NULL) mpCommandReceiver->onCommand(static_cast<CommandReceiver::INPUT_COMMAND>(command), data);
|
||||
}
|
||||
#else
|
||||
virtual void sendCommand(u32, void*);
|
||||
#endif
|
||||
virtual void updateFromReceiver(u32, void*) {}
|
||||
|
||||
nw4r::ut::Link mLink; // 0x00
|
||||
|
||||
@@ -10,7 +10,7 @@ namespace textinput {
|
||||
namespace toolbar {
|
||||
class Base {
|
||||
public:
|
||||
#if defined(TI_TOOLBAR_SAMPLE_CLASS) || defined(TIMANAGER_IMPLEMENTATION)
|
||||
#ifdef TI_TOOLBAR_SAMPLE_CLASS
|
||||
Base(Manager* manager) : mQwerty(true), meLanguage(USA), mpAllocator(NULL), mpManager(manager) {}
|
||||
#endif
|
||||
|
||||
@@ -35,20 +35,16 @@ namespace textinput {
|
||||
|
||||
class LayoutByNW4R : public Base, public nw4rmanager::Layout {
|
||||
public:
|
||||
#ifdef TIMANAGER_IMPLEMENTATION
|
||||
LayoutByNW4R(Manager* manager, nw4r::lyt::MultiArcResourceAccessor* resAccessor, EventObserver* observer, const char* layoutName)
|
||||
: Base(manager), nw4rmanager::Layout(resAccessor, layoutName, observer), mpEventHandler(NULL),
|
||||
mbIsEnableQwertyChg(false) {}
|
||||
#elif defined(TI_TOOLBAR_SAMPLE_CLASS)
|
||||
LayoutByNW4R(Manager* manager, nw4r::lyt::MultiArcResourceAccessor* resAccessor, EventObserver* observer)
|
||||
: Base(manager), nw4rmanager::Layout(resAccessor, "fs_VK_toolbar_a.brlyt", observer), mpEventHandler(NULL),
|
||||
#ifdef TI_TOOLBAR_SAMPLE_CLASS
|
||||
LayoutByNW4R(Manager* manager, nw4r::lyt::MultiArcResourceAccessor* resAccessor, const char* arcName, EventObserver* observer)
|
||||
: Base(manager), nw4rmanager::Layout(resAccessor, arcName, observer), mpEventHandler(NULL),
|
||||
mbIsEnableQwertyChg(false) {}
|
||||
#endif
|
||||
|
||||
virtual ~LayoutByNW4R();
|
||||
virtual void create(MEMAllocator* allocator) override;
|
||||
virtual void init() override;
|
||||
virtual void draw() override;
|
||||
virtual void init() override;
|
||||
|
||||
virtual void setQwerty(bool qwerty) override;
|
||||
virtual void setLanguage(Language language) override;
|
||||
@@ -56,19 +52,10 @@ namespace textinput {
|
||||
virtual void onOK();
|
||||
virtual void onCancel();
|
||||
virtual void setQwertyWithSE(bool qwerty);
|
||||
#ifdef TI_CELLPHONE_IMPLEMENTATION
|
||||
virtual bool isEnableKeytopChange() const { return mbIsEnableQwertyChg; }
|
||||
#else
|
||||
virtual bool isEnableKeytopChange() const;
|
||||
#endif
|
||||
virtual void enableKeytopChange(bool enable);
|
||||
#ifdef MYTIMANAGER_MATCHING
|
||||
virtual nw4r::lyt::Pane* getDownArea();
|
||||
virtual nw4r::lyt::Pane* getUpArea();
|
||||
#else
|
||||
virtual nw4r::lyt::Pane* getUpArea();
|
||||
virtual nw4r::lyt::Pane* getDownArea();
|
||||
#endif
|
||||
virtual void setOKButtonVisible(bool visible);
|
||||
virtual void setCancelButtonVisible(bool visible);
|
||||
virtual void setOKButtonCaption(const wchar_t* caption);
|
||||
@@ -130,21 +117,12 @@ namespace textinput {
|
||||
KeyType meKeyType; // 0x30
|
||||
};
|
||||
|
||||
#if defined(TI_TOOLBAR_SAMPLE_CLASS) || defined(TIMANAGER_IMPLEMENTATION)
|
||||
#ifdef TI_TOOLBAR_SAMPLE_CLASS
|
||||
class Sample : public LayoutByNW4R {
|
||||
public:
|
||||
#ifdef TIMANAGER_IMPLEMENTATION
|
||||
Sample(Manager* manager, nw4r::lyt::MultiArcResourceAccessor* resAccessor, EventObserver* observer, const char* layoutName)
|
||||
: LayoutByNW4R(manager, resAccessor, observer, layoutName) {}
|
||||
#else
|
||||
Sample(Manager* manager, nw4r::lyt::MultiArcResourceAccessor* resAccessor, EventObserver* observer)
|
||||
: LayoutByNW4R(manager, resAccessor, observer) {}
|
||||
#endif
|
||||
#ifdef TIMANAGER_IMPLEMENTATION
|
||||
virtual ~Sample();
|
||||
#else
|
||||
Sample(Manager* manager, nw4r::lyt::MultiArcResourceAccessor* resAccessor, const char* arcName, EventObserver* observer)
|
||||
: LayoutByNW4R(manager, resAccessor, arcName, observer) {}
|
||||
virtual ~Sample() {}
|
||||
#endif
|
||||
};
|
||||
#else
|
||||
class Sample {};
|
||||
|
||||
@@ -7,9 +7,6 @@
|
||||
|
||||
namespace textinput {
|
||||
namespace util {
|
||||
#ifdef TIINPUTFORM_IMPLEMENTATION
|
||||
wchar_t HankakuToZenkaku(wchar_t ch);
|
||||
#endif
|
||||
wchar_t toWLower(wchar_t ch);
|
||||
wchar_t toWUpper(wchar_t ch);
|
||||
|
||||
@@ -20,15 +17,9 @@ namespace textinput {
|
||||
wchar_t KBD_ConvertSmall(wchar_t ch);
|
||||
wchar_t KBD_ConvertAll(wchar_t ch);
|
||||
|
||||
#ifdef TISTRING_IMPLEMENTATION
|
||||
u32 KBD_IsDakuten(wchar_t ch);
|
||||
u32 KBD_IsHandaku(wchar_t ch);
|
||||
u32 KBD_IsSmall(wchar_t ch);
|
||||
#else
|
||||
bool KBD_IsDakuten(wchar_t ch);
|
||||
bool KBD_IsHandaku(wchar_t ch);
|
||||
bool KBD_IsSmall(wchar_t ch);
|
||||
#endif
|
||||
|
||||
bool strcmp(const char* s1, const char* s2);
|
||||
void replaceChar(char* dest, u32 destLen, const char* src, int replaceIdx, char newCh);
|
||||
@@ -55,11 +46,10 @@ namespace textinput {
|
||||
public:
|
||||
Animation() : mfAnimationTime(0.0f), mbInAnimation(false), mbSE(false), mpAnimObserver(NULL) {}
|
||||
|
||||
#ifdef TIINPUTFORM_IMPLEMENTATION
|
||||
virtual void startAnm(f32 start, f32 end, f32 duration, AnimObserver* observer, void* data);
|
||||
#else
|
||||
virtual void startAnm(AnimObserver*, f32, f32, f32, void*);
|
||||
#endif // 0x08
|
||||
virtual void startAnm(f32, f32, f32, AnimObserver*, void*); // 0x08
|
||||
void startAnm(AnimObserver* observer, f32 start, f32 end, f32 frame, void* arg) {
|
||||
startAnm(start, end, frame, observer, arg);
|
||||
}
|
||||
virtual void calc(); // 0x0C
|
||||
virtual f32 getValue(); // 0x10
|
||||
virtual bool isActive(); // 0x14
|
||||
|
||||
@@ -20,11 +20,7 @@ namespace gui {
|
||||
class Manager;
|
||||
class EventHandler;
|
||||
|
||||
#if defined(IPL_GC_SAVEDATA_NOVTABLE) || defined(IPL_MEMORY_CARD_NOVTABLE)
|
||||
class __declspec(novtable) Interface {
|
||||
#else
|
||||
class Interface {
|
||||
#endif
|
||||
public:
|
||||
virtual void create() {} // 0x08 (0x02)
|
||||
|
||||
@@ -34,14 +30,14 @@ namespace gui {
|
||||
virtual void draw(Mtx& mtx) {} // 0x14 (0x05)
|
||||
virtual void draw() {} // 0x18 (0x06)
|
||||
|
||||
#if defined(IPL_CHANNEL_TITLE_NOVTABLE) || defined(IPL_GC_SAVEDATA_NOVTABLE) || defined(IPL_MEMORY_CARD_NOVTABLE)
|
||||
#ifdef IPL_CHANNEL_TITLE_NOVTABLE
|
||||
virtual ~Interface(); // 0x1C (0x07)
|
||||
#else
|
||||
virtual ~Interface() {} // 0x1C (0x07)
|
||||
#endif
|
||||
};
|
||||
|
||||
#if defined(IPL_CHANNEL_TITLE_NOVTABLE) || defined(IPL_GC_WINDOW_NOVTABLE) || defined(IPL_GC_SAVEDATA_NOVTABLE) || defined(IPL_MEMORY_CARD_NOVTABLE)
|
||||
#ifdef IPL_CHANNEL_TITLE_NOVTABLE
|
||||
class __declspec(novtable) EventHandler {
|
||||
#else
|
||||
class EventHandler {
|
||||
|
||||
@@ -24,7 +24,7 @@ namespace ipl {
|
||||
mbDisableCon(bDisableCon) {}
|
||||
#endif
|
||||
|
||||
#if defined(IPL_CHANNEL_TITLE_NOVTABLE) || defined(IPL_GC_SAVEDATA_NOVTABLE) || defined(IPL_MEMORY_CARD_NOVTABLE)
|
||||
#ifdef IPL_CHANNEL_TITLE_NOVTABLE
|
||||
virtual ~PaneManager();
|
||||
#else
|
||||
virtual ~PaneManager() {}
|
||||
|
||||
@@ -69,7 +69,7 @@ namespace ipl {
|
||||
HermiteIntp() {}
|
||||
virtual ~HermiteIntp();
|
||||
|
||||
void init(const T& start, const T& end, f32 maxFrame, f32 startTangent, f32 endTangent, int playback = ANIM_TYPE_FORWARD, f32 speed = 1.0f);
|
||||
void init(const T& start, const T& end, f32 maxFrame, f32 param_5, f32 param_6, int playback = ANIM_TYPE_FORWARD, f32 speed = 1.0f);
|
||||
|
||||
T get() const {
|
||||
f32 var_f27 = mFrame;
|
||||
@@ -81,11 +81,11 @@ namespace ipl {
|
||||
(mEnd * ((var_f28 * (var_f28 * (var_f28 * (var_f27 * (2.0f * var_f27 * var_f27))))) -
|
||||
(var_f28 * (var_f28 * (3.0f * var_f27 * var_f27)))));
|
||||
r +=
|
||||
(mStartTangent *
|
||||
(unkVal0 *
|
||||
(var_f27 +
|
||||
((var_f28 * (var_f28 * (var_f27 * (var_f27 * var_f27)))) -
|
||||
(var_f28 * (2.0f * var_f27 * var_f27))))) +
|
||||
(mEndTangent * ((var_f28 * (var_f28 * (var_f27 * (var_f27 * var_f27)))) -
|
||||
(unkVal1 * ((var_f28 * (var_f28 * (var_f27 * (var_f27 * var_f27)))) -
|
||||
(var_f28 * (var_f27 * var_f27))));
|
||||
|
||||
return r;
|
||||
@@ -101,7 +101,7 @@ namespace ipl {
|
||||
f32 temp_f4 = var_f27 * var_f27;
|
||||
f32 temp_f7 = var_f28 * (var_f28 * (var_f27 * temp_f4));
|
||||
f32 temp_f3 =
|
||||
(mStartTangent * (var_f27 + (temp_f7 - (var_f28 * (2.0f * var_f27 * var_f27))))) + (mEndTangent * (temp_f7 - (var_f28 * temp_f4)));
|
||||
(unkVal0 * (var_f27 + (temp_f7 - (var_f28 * (2.0f * var_f27 * var_f27))))) + (unkVal1 * (temp_f7 - (var_f28 * temp_f4)));
|
||||
r = r + temp_f3;
|
||||
return r;*/
|
||||
}
|
||||
@@ -109,8 +109,8 @@ namespace ipl {
|
||||
protected:
|
||||
T mStart;
|
||||
T mEnd;
|
||||
f32 mStartTangent;
|
||||
f32 mEndTangent;
|
||||
f32 unkVal0;
|
||||
f32 unkVal1;
|
||||
};
|
||||
|
||||
template <>
|
||||
@@ -119,7 +119,7 @@ namespace ipl {
|
||||
HermiteIntp() {}
|
||||
virtual ~HermiteIntp();
|
||||
|
||||
void init(const f32& start, const f32& end, f32 maxFrame, f32 startTangent, f32 endTangent, int playback = ANIM_TYPE_FORWARD,
|
||||
void init(const f32& start, const f32& end, f32 maxFrame, f32 param_5, f32 param_6, int playback = ANIM_TYPE_FORWARD,
|
||||
f32 speed = 1.0f);
|
||||
|
||||
f32 get() const {
|
||||
@@ -132,10 +132,10 @@ namespace ipl {
|
||||
(mEnd * ((var_f28 * (var_f28 * (var_f28 * (var_f27 * (2.0f * var_f27 * var_f27))))) -
|
||||
(var_f28 * (var_f28 * (3.0f * var_f27 * var_f27)))));
|
||||
r +=
|
||||
(mStartTangent *
|
||||
(unkVal0 *
|
||||
(var_f27 + ((var_f28 * (var_f28 * (var_f27 * (var_f27 * var_f27)))) -
|
||||
(var_f28 * (2.0f * var_f27 * var_f27))))) +
|
||||
(mEndTangent * ((var_f28 * (var_f28 * (var_f27 * (var_f27 * var_f27)))) -
|
||||
(unkVal1 * ((var_f28 * (var_f28 * (var_f27 * (var_f27 * var_f27)))) -
|
||||
(var_f28 * (var_f27 * var_f27))));
|
||||
|
||||
return r;
|
||||
@@ -144,8 +144,8 @@ namespace ipl {
|
||||
protected:
|
||||
f32 mStart;
|
||||
f32 mEnd;
|
||||
f32 mStartTangent;
|
||||
f32 mEndTangent;
|
||||
f32 unkVal0;
|
||||
f32 unkVal1;
|
||||
};
|
||||
|
||||
#pragma dont_instantiate HermiteIntp<float>
|
||||
@@ -155,12 +155,12 @@ namespace ipl {
|
||||
public:
|
||||
HermiteIntp() {}
|
||||
|
||||
void init(const T& start, const T& end, f32 maxFrame, f32 startTangent, f32 endTangent, int playback = ANIM_TYPE_FORWARD, f32 speed = 1.0f) {
|
||||
void init(const T& start, const T& end, f32 maxFrame, f32 param_5, f32 param_6, int playback = ANIM_TYPE_FORWARD, f32 speed = 1.0f) {
|
||||
mStart = start;
|
||||
mEnd = end;
|
||||
utility::FrameController::init(playback, maxFrame, 0.0f, speed);
|
||||
mStartTangent = startTangent;
|
||||
mEndTangent = endTangent;
|
||||
unkVal0 = param_5;
|
||||
unkVal1 = param_6;
|
||||
}
|
||||
|
||||
#ifdef IPL_SD_CHANNEL_SELECT_CPP
|
||||
@@ -176,9 +176,9 @@ namespace ipl {
|
||||
inverseDuration * (inverseDuration * (3.0f * frame * frame))));
|
||||
f32 frameSquared = frame * frame;
|
||||
f32 cubic = inverseDuration * (inverseDuration * (frame * frameSquared));
|
||||
f32 tangent = mStartTangent * (frame + (cubic -
|
||||
f32 tangent = unkVal0 * (frame + (cubic -
|
||||
inverseDuration * (2.0f * frame * frame))) +
|
||||
mEndTangent * (cubic - inverseDuration * frameSquared);
|
||||
unkVal1 * (cubic - inverseDuration * frameSquared);
|
||||
result.x += tangent;
|
||||
result.y += tangent;
|
||||
result.z += tangent;
|
||||
@@ -196,7 +196,7 @@ namespace ipl {
|
||||
f32 temp_f4 = var_f27 * var_f27;
|
||||
f32 temp_f7 = var_f28 * (var_f28 * (var_f27 * temp_f4));
|
||||
f32 temp_f3 =
|
||||
(mStartTangent * (var_f27 + (temp_f7 - (var_f28 * (2.0f * var_f27 * var_f27))))) + (mEndTangent * (temp_f7 - (var_f28 * temp_f4)));
|
||||
(unkVal0 * (var_f27 + (temp_f7 - (var_f28 * (2.0f * var_f27 * var_f27))))) + (unkVal1 * (temp_f7 - (var_f28 * temp_f4)));
|
||||
|
||||
r = r + temp_f3;
|
||||
|
||||
@@ -213,55 +213,15 @@ namespace ipl {
|
||||
f32 temp_f4 = var_f27 * var_f27;
|
||||
f32 temp_f7 = var_f28 * (var_f28 * (var_f27 * temp_f4));
|
||||
f32 temp_f3 =
|
||||
(mStartTangent * (var_f27 + (temp_f7 - (var_f28 * (2.0f * var_f27 * var_f27))))) + (mEndTangent * (temp_f7 - (var_f28 * temp_f4)));
|
||||
(unkVal0 * (var_f27 + (temp_f7 - (var_f28 * (2.0f * var_f27 * var_f27))))) + (unkVal1 * (temp_f7 - (var_f28 * temp_f4)));
|
||||
r = r + temp_f3;
|
||||
return r;*/
|
||||
}
|
||||
#endif
|
||||
|
||||
protected:
|
||||
f32 mStartTangent;
|
||||
f32 mEndTangent;
|
||||
};
|
||||
#endif
|
||||
|
||||
#ifdef IPL_SD_CHANNEL_SELECT_CPP
|
||||
} // namespace math
|
||||
} // namespace ipl
|
||||
#include "math/iplMathTypes.h"
|
||||
namespace ipl {
|
||||
namespace math {
|
||||
template <>
|
||||
class HermiteIntp<VEC3> : public utility::FrameController {
|
||||
public:
|
||||
HermiteIntp() {}
|
||||
virtual ~HermiteIntp();
|
||||
void init(const VEC3& start, const VEC3& end, f32 maxFrame, f32 startTangent, f32 endTangent, int playback = ANIM_TYPE_FORWARD, f32 speed = 1.0f);
|
||||
VEC3 get() const {
|
||||
f32 frame = mFrame;
|
||||
f32 inverseDuration = 1.0f / mMaxFrame;
|
||||
VEC3 result =
|
||||
(mStart * (1.0f + (inverseDuration * (inverseDuration *
|
||||
(inverseDuration * (frame * (2.0f * frame * frame)))) -
|
||||
inverseDuration * (inverseDuration * (3.0f * frame * frame))))) -
|
||||
(mEnd * (inverseDuration * (inverseDuration *
|
||||
(inverseDuration * (frame * (2.0f * frame * frame)))) -
|
||||
inverseDuration * (inverseDuration * (3.0f * frame * frame))));
|
||||
f32 frameSquared = frame * frame;
|
||||
f32 cubic = inverseDuration * (inverseDuration * (frame * frameSquared));
|
||||
f32 tangent = mStartTangent * (frame + (cubic -
|
||||
inverseDuration * (2.0f * frame * frame))) +
|
||||
mEndTangent * (cubic - inverseDuration * frameSquared);
|
||||
result.x += tangent;
|
||||
result.y += tangent;
|
||||
result.z += tangent;
|
||||
return result;
|
||||
}
|
||||
protected:
|
||||
VEC3 mStart;
|
||||
VEC3 mEnd;
|
||||
f32 mStartTangent;
|
||||
f32 mEndTangent;
|
||||
f32 unkVal0;
|
||||
f32 unkVal1;
|
||||
};
|
||||
#endif
|
||||
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
|
||||
namespace ipl {
|
||||
namespace scene {
|
||||
class GCWindow : public MemoryBase, public MemCardEventListener {
|
||||
class GCWindow : public MemoryBase, public MemCardEventHandler {
|
||||
#ifdef IPL_MEMORY_CARD_CPP
|
||||
friend class MemoryCard;
|
||||
#endif
|
||||
@@ -48,25 +48,6 @@ private:
|
||||
void set_texture(const char*, const GXTexObj&);
|
||||
public:
|
||||
virtual void onMemEvent(long, u8);
|
||||
#ifdef IPL_GC_WINDOW_CPP
|
||||
virtual void on_wait_anim() = 0;
|
||||
virtual void on_exit() = 0;
|
||||
virtual void on_error() = 0;
|
||||
virtual void on_format() = 0;
|
||||
virtual void on_dialog_result() = 0;
|
||||
virtual void on_select_in() = 0;
|
||||
virtual void on_message_done() = 0;
|
||||
virtual void on_button_trig() = 0;
|
||||
#else
|
||||
virtual void on_wait_anim();
|
||||
virtual void on_exit();
|
||||
virtual void on_error();
|
||||
virtual void on_format();
|
||||
virtual void on_dialog_result();
|
||||
virtual void on_select_in();
|
||||
virtual void on_message_done();
|
||||
virtual void on_button_trig();
|
||||
#endif
|
||||
bool isProcess();
|
||||
void stop_wait_anim();
|
||||
|
||||
|
||||
@@ -35,11 +35,7 @@ namespace ipl {
|
||||
MemoryBase* mpBase; // 0x0C
|
||||
};
|
||||
|
||||
#ifdef IPL_CHANNEL_TITLE_NOVTABLE
|
||||
class __declspec(novtable) MemoryBase {
|
||||
#else
|
||||
class MemoryBase {
|
||||
#endif
|
||||
public:
|
||||
class Anm {
|
||||
public:
|
||||
|
||||
@@ -12,61 +12,13 @@
|
||||
|
||||
namespace ipl {
|
||||
namespace scene {
|
||||
class __declspec(novtable) MemCardEventListener {
|
||||
public:
|
||||
MemCardEventListener() {}
|
||||
|
||||
virtual ~MemCardEventListener() {}
|
||||
|
||||
virtual void onMemEvent(long event, u8 slot);
|
||||
};
|
||||
|
||||
class MemCardEventHandler : public MemCardEventListener {
|
||||
class MemCardEventHandler {
|
||||
public:
|
||||
MemCardEventHandler() {}
|
||||
|
||||
virtual ~MemCardEventHandler();
|
||||
|
||||
virtual void onMemEvent(long event, u8 slot);
|
||||
|
||||
virtual void onMount(u8 slot) = 0;
|
||||
virtual void onUnmount(u8 slot) = 0;
|
||||
virtual void onAttach(u8 slot) = 0;
|
||||
virtual void onDetach(u8 slot) = 0;
|
||||
virtual void onCheck(u8 slot) = 0;
|
||||
virtual void onFormat(u8 slot) = 0;
|
||||
virtual void onRepair(u8 slot) = 0;
|
||||
virtual void onRead(u8 slot) = 0;
|
||||
virtual void onWrite(u8 slot) = 0;
|
||||
virtual void onOpen(u8 slot) = 0;
|
||||
virtual void onClose(u8 slot) = 0;
|
||||
virtual void onCreate(u8 slot) = 0;
|
||||
virtual void onDelete(u8 slot) = 0;
|
||||
virtual void onCopy(u8 slot) = 0;
|
||||
virtual void onMove(u8 slot) = 0;
|
||||
virtual void onRename(u8 slot) = 0;
|
||||
virtual void onVerify(u8 slot) = 0;
|
||||
virtual void onCommit(u8 slot) = 0;
|
||||
virtual void onProbe(u8 slot) = 0;
|
||||
virtual void onMountAsync(u8 slot) = 0;
|
||||
virtual void onUnmountAsync(u8 slot) = 0;
|
||||
virtual void onCheckAsync(u8 slot) = 0;
|
||||
virtual void onFormatAsync(u8 slot) = 0;
|
||||
virtual void onReadAsync(u8 slot) = 0;
|
||||
virtual void onWriteAsync(u8 slot) = 0;
|
||||
virtual void onCreateAsync(u8 slot) = 0;
|
||||
virtual void onDeleteAsync(u8 slot) = 0;
|
||||
virtual void onCopyAsync(u8 slot) = 0;
|
||||
virtual void onMoveAsync(u8 slot) = 0;
|
||||
virtual void onRenameAsync(u8 slot) = 0;
|
||||
virtual void onVerifyAsync(u8 slot) = 0;
|
||||
virtual void onCommitAsync(u8 slot) = 0;
|
||||
virtual void onProbeAsync(u8 slot) = 0;
|
||||
virtual void onFreeBlocks(u8 slot) = 0;
|
||||
virtual void onGetLength(u8 slot) = 0;
|
||||
virtual void onSetAttrib(u8 slot) = 0;
|
||||
virtual void onGetAttrib(u8 slot) = 0;
|
||||
virtual void onSlotStatus(u8 slot) = 0;
|
||||
};
|
||||
|
||||
typedef struct MCFile {
|
||||
@@ -104,44 +56,6 @@ namespace ipl {
|
||||
}
|
||||
virtual ~MemoryCardManager();
|
||||
|
||||
virtual void onMount(u8 slot) = 0;
|
||||
virtual void onUnmount(u8 slot) = 0;
|
||||
virtual void onAttach(u8 slot) = 0;
|
||||
virtual void onDetach(u8 slot) = 0;
|
||||
virtual void onCheck(u8 slot) = 0;
|
||||
virtual void onFormat(u8 slot) = 0;
|
||||
virtual void onRepair(u8 slot) = 0;
|
||||
virtual void onRead(u8 slot) = 0;
|
||||
virtual void onWrite(u8 slot) = 0;
|
||||
virtual void onOpen(u8 slot) = 0;
|
||||
virtual void onClose(u8 slot) = 0;
|
||||
virtual void onCreate(u8 slot) = 0;
|
||||
virtual void onDelete(u8 slot) = 0;
|
||||
virtual void onCopy(u8 slot) = 0;
|
||||
virtual void onMove(u8 slot) = 0;
|
||||
virtual void onRename(u8 slot) = 0;
|
||||
virtual void onVerify(u8 slot) = 0;
|
||||
virtual void onCommit(u8 slot) = 0;
|
||||
virtual void onProbe(u8 slot) = 0;
|
||||
virtual void onMountAsync(u8 slot) = 0;
|
||||
virtual void onUnmountAsync(u8 slot) = 0;
|
||||
virtual void onCheckAsync(u8 slot) = 0;
|
||||
virtual void onFormatAsync(u8 slot) = 0;
|
||||
virtual void onReadAsync(u8 slot) = 0;
|
||||
virtual void onWriteAsync(u8 slot) = 0;
|
||||
virtual void onCreateAsync(u8 slot) = 0;
|
||||
virtual void onDeleteAsync(u8 slot) = 0;
|
||||
virtual void onCopyAsync(u8 slot) = 0;
|
||||
virtual void onMoveAsync(u8 slot) = 0;
|
||||
virtual void onRenameAsync(u8 slot) = 0;
|
||||
virtual void onVerifyAsync(u8 slot) = 0;
|
||||
virtual void onCommitAsync(u8 slot) = 0;
|
||||
virtual void onProbeAsync(u8 slot) = 0;
|
||||
virtual void onFreeBlocks(u8 slot) = 0;
|
||||
virtual void onGetLength(u8 slot) = 0;
|
||||
virtual void onSetAttrib(u8 slot) = 0;
|
||||
virtual void onGetAttrib(u8 slot) = 0;
|
||||
|
||||
void calc();
|
||||
|
||||
bool isSlotReady(u8 slot);
|
||||
@@ -182,7 +96,7 @@ namespace ipl {
|
||||
u16 getFreeBlocks(u8 slot);
|
||||
#endif
|
||||
|
||||
void setEventHandler(MemCardEventListener* eventHandler) {
|
||||
void setEventHandler(MemCardEventHandler* eventHandler) {
|
||||
mpEventHandler = eventHandler;
|
||||
}
|
||||
|
||||
@@ -193,7 +107,7 @@ namespace ipl {
|
||||
s32 mLastResult; // 0x16930
|
||||
s32 mLastCmd; // 0x16934
|
||||
u32 unk_0x16938; // 0x16938
|
||||
MemCardEventListener* mpEventHandler; // 0x1693C
|
||||
MemCardEventHandler* mpEventHandler; // 0x1693C
|
||||
};
|
||||
} // namespace scene
|
||||
} // namespace ipl
|
||||
|
||||
@@ -395,9 +395,9 @@ namespace ipl {
|
||||
NandSDWorker* mpSDWorker;
|
||||
ESTitleId32* mpSDTitleIds;
|
||||
SDChannelSelectTitleInfo* mpSDTitleInfo;
|
||||
mutable NandSDWorker::TitleUsage* mpNandTitleInfo;
|
||||
mutable s32 mFirstTitleCount;
|
||||
mutable s32 mSecondTitleCount;
|
||||
NandSDWorker::TitleUsage* mpNandTitleInfo;
|
||||
s32 mFirstTitleCount;
|
||||
s32 mSecondTitleCount;
|
||||
SDChannelObj* mpCurrentLoadedChannel;
|
||||
u32 mSDTitleCount;
|
||||
u32 mNandTitleCount;
|
||||
|
||||
@@ -167,12 +167,12 @@ namespace ipl {
|
||||
|
||||
bool is_stopped_all_anm() const;
|
||||
|
||||
void calc_exit_sequence();
|
||||
void fn_81409864();
|
||||
|
||||
void prepare_exit_abort();
|
||||
void wait_decide_se();
|
||||
void start_exit_fade();
|
||||
void finish_exit_reboot();
|
||||
void fn_814098F4();
|
||||
void fn_unk_inline();
|
||||
void fn_81409988();
|
||||
void fn_814099EC();
|
||||
|
||||
int mState; // 0x60
|
||||
int mPrevState; // 0x64
|
||||
|
||||
@@ -38,49 +38,21 @@ namespace ipl {
|
||||
int holdSE(const char* sndName);
|
||||
int holdSEwithPosDis(const char* sndName, f32 x, f32 y);
|
||||
|
||||
#ifdef IPL_SOUND_MATCHING
|
||||
void stopBGM(int unk = 0);
|
||||
#else
|
||||
int stopBGM(int unk = 0);
|
||||
#endif
|
||||
int stopBGM(nw4r::snd::SoundHandle* handle, int unk = 0);
|
||||
int stopSE(nw4r::snd::SoundHandle* handle, int unk = 0);
|
||||
void stopAllSound(int unk = 0);
|
||||
|
||||
int resetAllSound();
|
||||
|
||||
#ifdef IPL_SOUND_MATCHING
|
||||
void muteOffBGM(int);
|
||||
#else
|
||||
int muteOffBGM(int);
|
||||
#endif
|
||||
#ifdef IPL_SOUND_MATCHING
|
||||
void muteOnBGM(int);
|
||||
#else
|
||||
int muteOnBGM(int);
|
||||
#endif
|
||||
|
||||
#ifdef IPL_SOUND_MATCHING
|
||||
void pauseOnBGM();
|
||||
#else
|
||||
int pauseOnBGM();
|
||||
#endif
|
||||
#ifdef IPL_SOUND_MATCHING
|
||||
void pauseOffBGM();
|
||||
#else
|
||||
int pauseOffBGM();
|
||||
#endif
|
||||
|
||||
#ifdef IPL_SOUND_MATCHING
|
||||
void pauseOnSE();
|
||||
#else
|
||||
int pauseOnSE();
|
||||
#endif
|
||||
#ifdef IPL_SOUND_MATCHING
|
||||
void pauseOffSE();
|
||||
#else
|
||||
int pauseOffSE();
|
||||
#endif
|
||||
|
||||
void setOutputMode(EAudioOutputMode mode);
|
||||
|
||||
|
||||
@@ -39,7 +39,7 @@ namespace ipl {
|
||||
void stt_wait_fns_msg();
|
||||
void stt_wait_terminate();
|
||||
|
||||
int getProgressPercent();
|
||||
int fn_8135B1C0();
|
||||
|
||||
void error_handling();
|
||||
|
||||
|
||||
@@ -336,19 +336,19 @@ namespace ipl {
|
||||
|
||||
BOOL nand_error_handling(int code);
|
||||
|
||||
SEntry* findEntryByTitleId(ESTitleId titleId);
|
||||
u32 getBannerCSIdx(ESTitleId titleId);
|
||||
u32 getSoundSize(ESTitleId titleId);
|
||||
BOOL needsNetSetting(ESTitleId titleId);
|
||||
BOOL usesAltSound(ESTitleId titleId);
|
||||
BOOL isMissingTicket(ESTitleId titleId);
|
||||
BOOL isNewsChannelV6Plus(ESTitleId titleId);
|
||||
BOOL isOperaChannel(ESTitleId titleId);
|
||||
nand::MetaFile* readBannerMetaAsync(EGG::Heap* heap, ESTitleId titleId);
|
||||
nand::MetaFile* readSoundMetaAsync(EGG::Heap* heap, ESTitleId titleId);
|
||||
nand::SharedFile* readBannerCSAsync(EGG::Heap* heap, ESTitleId titleId);
|
||||
void clearTmpChannel();
|
||||
void unloadBanner(ESTitleId titleId);
|
||||
SEntry* fn_8133A4E0(ESTitleId titleId);
|
||||
u32 fn_8133A57C(ESTitleId titleId);
|
||||
u32 fn_8133A5B8(ESTitleId titleId);
|
||||
BOOL fn_8133A5F0(ESTitleId titleId);
|
||||
BOOL fn_8133A634(ESTitleId titleId);
|
||||
BOOL fn_8133A678(ESTitleId titleId);
|
||||
BOOL fn_8133A6B8(ESTitleId titleId);
|
||||
BOOL fn_8133A73C(ESTitleId titleId);
|
||||
nand::MetaFile* fn_8133A7A4(EGG::Heap* heap, ESTitleId titleId);
|
||||
nand::MetaFile* fn_8133A85C(EGG::Heap* heap, ESTitleId titleId);
|
||||
nand::SharedFile* fn_8133A924(EGG::Heap* heap, ESTitleId titleId);
|
||||
void fn_8133A9F0();
|
||||
void fn_8133AA50(ESTitleId titleId);
|
||||
|
||||
BOOL isReady() { return mState == FINISH; }
|
||||
|
||||
|
||||
@@ -16,7 +16,7 @@ namespace ipl {
|
||||
virtual void onSE(textinput::sound::SE seId);
|
||||
virtual void onOK();
|
||||
virtual void onCancel();
|
||||
virtual void setManager(Manager* manager) { mpKeyboardMgr = manager; }
|
||||
virtual void setManager(Manager* manager);
|
||||
|
||||
private:
|
||||
Manager* mpKeyboardMgr; // 0x04
|
||||
|
||||
@@ -92,7 +92,7 @@ namespace ipl {
|
||||
void read_sd_app_location_async(ESTitleId32* titleIds);
|
||||
void check_for_sd_app_to_nand_async(ESTitleId titleId, AppBlocksInfo* usedBlocks, AppBlocksInfo* freeBlocks);
|
||||
void check_backup_fits_async(TitleIdList* newTitles, TitleIdList* replacingTitles);
|
||||
void check_sd_app_titles_async(void* ptrA, void* ptrB, void* ptrC);
|
||||
void iplNandSD_81348EA8(void* ptrA, void* ptrB, void* ptrC);
|
||||
|
||||
void list_nand_apps_usage_async(void* ptrA, void* ptr);
|
||||
|
||||
@@ -514,7 +514,7 @@ namespace ipl {
|
||||
void do_check_for_sd_app_to_nand();
|
||||
void check_backup_fits();
|
||||
void do_list_nand_apps_usage();
|
||||
void do_check_sd_app_titles();
|
||||
void do_unk_8134C838();
|
||||
|
||||
void do_move_nand_app_to_sd();
|
||||
void do_move_sd_app_to_nand();
|
||||
|
||||
@@ -24,7 +24,7 @@ namespace ipl {
|
||||
class Manager;
|
||||
}
|
||||
namespace savedata {
|
||||
extern "C" BOOL isTitleCached(void* manager, ESTitleId titleId);
|
||||
extern "C" BOOL iplSavedata_813597A0(void* manager, ESTitleId titleId);
|
||||
|
||||
class Manager {
|
||||
public:
|
||||
@@ -87,7 +87,7 @@ namespace ipl {
|
||||
channel::SInfo& getChanInfo(int page, int index) { return mData.chanInfo[page][index]; }
|
||||
textinput::extend::savedata::MemoSetting getMemoSetting() { return mData.memoSetting; }
|
||||
|
||||
void pushTitleCache(ESTitleId titleId);
|
||||
void iplSavedata_813596B8(ESTitleId titleId);
|
||||
|
||||
private:
|
||||
#ifdef IPL_SD_CHANNEL_SELECT_ACCESS
|
||||
@@ -184,7 +184,7 @@ namespace ipl {
|
||||
u8 unused_0x504[28];
|
||||
|
||||
friend class channel::Manager;
|
||||
friend BOOL isTitleCached(void* manager, ESTitleId titleId);
|
||||
friend BOOL iplSavedata_813597A0(void* manager, ESTitleId titleId);
|
||||
};
|
||||
} // namespace savedata
|
||||
} // namespace ipl
|
||||
|
||||
@@ -48,14 +48,10 @@ namespace EGG {
|
||||
virtual bool prepareSound(nw4r::snd::SoundHandle* pHandle, u32 id) { return mSoundArchivePlayer.PrepareSound(pHandle, id); } // 0x44
|
||||
virtual bool prepareSound(nw4r::snd::SoundHandle* pHandle, unsigned int id) { return mSoundArchivePlayer.PrepareSound(pHandle, id); } // 0x44
|
||||
virtual bool prepareSound(nw4r::snd::SoundHandle* pHandle, const char* pName) {
|
||||
#ifdef IPL_SOUND_MATCHING
|
||||
u32 id = changeNameToId(pName);
|
||||
#else
|
||||
u32 id = nw4r::snd::SoundArchive::INVALID_ID;
|
||||
if (mpArchive != NULL) {
|
||||
id = changeNameToId(pName);
|
||||
}
|
||||
#endif
|
||||
|
||||
return mSoundArchivePlayer.PrepareSound(pHandle, id);
|
||||
} // 0x48
|
||||
|
||||
@@ -20,13 +20,9 @@ namespace EGG {
|
||||
~SoundHeapMgr() { destroySoundHeap(); }
|
||||
|
||||
virtual bool loadState(s32 id) {
|
||||
#ifdef IPL_SOUND_MATCHING
|
||||
if (id > 0 && mHeap.GetCurrentLevel() >= id) {
|
||||
#else
|
||||
s32 level = mHeap.GetCurrentLevel();
|
||||
|
||||
if (id > 0 && level >= id) {
|
||||
#endif
|
||||
mHeap.LoadState(id);
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -17,6 +17,7 @@ namespace nw4r {
|
||||
class FontRefLink {
|
||||
public:
|
||||
FontRefLink();
|
||||
~FontRefLink();
|
||||
|
||||
void Set(const char* name, ut::Font* pFont);
|
||||
|
||||
|
||||
@@ -11,11 +11,7 @@ namespace nw4r {
|
||||
namespace snd {
|
||||
class SoundHandle : private ut::NonCopyable {
|
||||
public:
|
||||
#ifdef IPL_SOUND_MATCHING
|
||||
SoundHandle() NO_INLINE;
|
||||
#else
|
||||
SoundHandle() NO_INLINE : mSound(NULL) {}
|
||||
#endif
|
||||
~SoundHandle() { DetachSound(); }
|
||||
|
||||
void detail_AttachSound(detail::BasicSound* sound);
|
||||
|
||||
@@ -31,14 +31,7 @@ namespace nw4r {
|
||||
ut::detail::AutoLock<OSMutex> lock(mMutex);
|
||||
return mFrameHeap.SaveState();
|
||||
}
|
||||
#ifdef IPL_SOUND_MATCHING
|
||||
void LoadState(int id) {
|
||||
ut::detail::AutoLock<OSMutex> lock(mMutex);
|
||||
mFrameHeap.LoadState(id);
|
||||
}
|
||||
#else
|
||||
void LoadState(int id);
|
||||
#endif
|
||||
|
||||
bool IsValid() { return mFrameHeap.IsValid(); }
|
||||
|
||||
|
||||
@@ -20,7 +20,7 @@ namespace nw4r {
|
||||
Rect(f32 l, f32 t, f32 r, f32 b) : left(l), top(t), right(r), bottom(b) {}
|
||||
#endif
|
||||
|
||||
#if !defined(IPL_CONTROLLER_TRIVIAL_RECT_DTOR) && !defined(IPL_MEMORYCARD_BASE_CPP)
|
||||
#ifndef IPL_CONTROLLER_TRIVIAL_RECT_DTOR
|
||||
~Rect() {}
|
||||
#endif
|
||||
|
||||
|
||||
@@ -37,7 +37,7 @@ namespace nw4r {
|
||||
} // namespace detail
|
||||
|
||||
template <typename TDerived, typename TBase>
|
||||
#if defined(IPL_BOARD_OBJECT_EXTERNAL_DYNAMIC_CAST) || defined(IPL_MEMORYCARD_BASE_CPP)
|
||||
#ifdef IPL_BOARD_OBJECT_EXTERNAL_DYNAMIC_CAST
|
||||
TDerived DynamicCast(TBase* pPtr);
|
||||
#else
|
||||
inline TDerived DynamicCast(TBase* pPtr) {
|
||||
|
||||
@@ -301,9 +301,9 @@ namespace nw4r {
|
||||
}
|
||||
|
||||
if (error == OS_EXCEPTION_FLOATING_POINT_EXCEPTION) {
|
||||
u32 fpcsr = sException.FPCSR_COPY;
|
||||
fpcsr &= (((fpcsr & 0xf8) << 0x16) | 0x01f80700);
|
||||
if ((fpcsr & 0x20000000) != 0) {
|
||||
u32 uVar1 = sException.FPCSR_COPY;
|
||||
uVar1 &= (((uVar1 & 0xf8) << 0x16) | 0x01f80700);
|
||||
if ((uVar1 & 0x20000000) != 0) {
|
||||
Exception_Printf_(" FPE: Invalid operation\n");
|
||||
if ((sException.FPCSR_COPY & 0x1000000) != 0) {
|
||||
Exception_Printf_(" SNaN\n");
|
||||
@@ -333,16 +333,16 @@ namespace nw4r {
|
||||
Exception_Printf_(" Invalid integer convert\n");
|
||||
}
|
||||
}
|
||||
if ((fpcsr & 0x10000000) != 0) {
|
||||
if ((uVar1 & 0x10000000) != 0) {
|
||||
Exception_Printf_(" FPE: Overflow\n");
|
||||
}
|
||||
if ((fpcsr & 0x8000000) != 0) {
|
||||
if ((uVar1 & 0x8000000) != 0) {
|
||||
Exception_Printf_(" FPE: Underflow\n");
|
||||
}
|
||||
if ((fpcsr & 0x4000000) != 0) {
|
||||
if ((uVar1 & 0x4000000) != 0) {
|
||||
Exception_Printf_(" FPE: Zero division\n");
|
||||
}
|
||||
if ((fpcsr & 0x2000000) != 0) {
|
||||
if ((uVar1 & 0x2000000) != 0) {
|
||||
Exception_Printf_(" FPE: Inexact result\n");
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,19 +1,19 @@
|
||||
#include <nw4r/db/assert.h>
|
||||
|
||||
extern "C" const u8 scLytFatalColorR = 255;
|
||||
extern "C" const u8 scLytFatalColorG = 255;
|
||||
extern "C" const u8 scLytFatalColorB = 255;
|
||||
extern "C" const u8 scLytFatalColorA = 0;
|
||||
extern "C" char scLytFatalMsg[] = "Error#004\nAn error has occurred.\nThe system files are corrupted.";
|
||||
extern "C" const u8 lbl_81695550 = 255;
|
||||
extern "C" const u8 lbl_81695551 = 255;
|
||||
extern "C" const u8 lbl_81695552 = 255;
|
||||
extern "C" const u8 lbl_81695553 = 0;
|
||||
extern "C" char lbl_816719DC[] = "Error#004\nAn error has occurred.\nThe system files are corrupted.";
|
||||
|
||||
#undef NW4R_ASSERT
|
||||
#define NW4R_ASSERT(x) \
|
||||
{ \
|
||||
if (!(x)) { \
|
||||
GXColor front = {*((volatile const u8*)&::scLytFatalColorR), *((volatile const u8*)&::scLytFatalColorG), \
|
||||
*((volatile const u8*)&::scLytFatalColorB), *((volatile const u8*)&::scLytFatalColorA)}; \
|
||||
GXColor front = {*((volatile const u8*)&::lbl_81695550), *((volatile const u8*)&::lbl_81695551), \
|
||||
*((volatile const u8*)&::lbl_81695552), *((volatile const u8*)&::lbl_81695553)}; \
|
||||
GXColor back = {0, 0, 0, 0}; \
|
||||
OSFatal((GXColor)front, (GXColor)back, ::scLytFatalMsg); \
|
||||
OSFatal((GXColor)front, (GXColor)back, ::lbl_816719DC); \
|
||||
} \
|
||||
}
|
||||
|
||||
|
||||
@@ -17,96 +17,7 @@ static TMCHuffmanEntry readHuffmanLimit(const TMCHuffmanEntry* entries) {
|
||||
return limit;
|
||||
}
|
||||
|
||||
static inline s32 decodeLongHuffman(s32 bitCount, const TMCHuffmanEntry* table, const u8* symbols, TMCCJPEGDecWork* work) {
|
||||
u32 bitData;
|
||||
u32 code;
|
||||
u32 length;
|
||||
const TMCHuffmanEntry* entry;
|
||||
|
||||
if (bitCount <= 17) {
|
||||
s32 result = TMCJPEGDEC_load_buff(work);
|
||||
if (result < 0) {
|
||||
return result;
|
||||
}
|
||||
}
|
||||
bitCount = work->bitCount;
|
||||
bitData = work->bitBuf;
|
||||
bitCount -= 9;
|
||||
code = (bitData >> bitCount) & 0x1FF;
|
||||
work->bitCount = bitCount;
|
||||
length = 9;
|
||||
entry = table + 9;
|
||||
goto read_entry;
|
||||
while (1) {
|
||||
length++;
|
||||
entry++;
|
||||
if (length > 16) {
|
||||
return TMCC_ERROR_OVERFLOW;
|
||||
}
|
||||
bitCount = work->bitCount;
|
||||
code <<= 1;
|
||||
bitData = work->bitBuf;
|
||||
bitCount--;
|
||||
work->bitCount = bitCount;
|
||||
code |= (bitData >> bitCount) & 1;
|
||||
read_entry:
|
||||
{
|
||||
TMCHuffmanEntry decoded = readHuffmanLimit(entry);
|
||||
if (code > (u32)decoded.bitLength) {
|
||||
continue;
|
||||
}
|
||||
code = code - entry->bitLength + entry->symbol;
|
||||
return symbols[code & 0xFF];
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static inline s32 decodeACHuffman(s32 bitCount, const TMCHuffmanEntry* entry, const u8* symbols, TMCCJPEGDecWork* work) {
|
||||
u32 bitData;
|
||||
u32 code;
|
||||
u32 length;
|
||||
|
||||
if (bitCount <= 17) {
|
||||
s32 result = TMCJPEGDEC_load_buff(work);
|
||||
if (result < 0) {
|
||||
return result;
|
||||
}
|
||||
}
|
||||
bitCount = work->bitCount;
|
||||
bitData = work->bitBuf;
|
||||
bitCount -= 9;
|
||||
code = (bitData >> bitCount) & 0x1FF;
|
||||
work->bitCount = bitCount;
|
||||
length = 9;
|
||||
entry += 9;
|
||||
goto read_entry;
|
||||
while (1) {
|
||||
length++;
|
||||
entry++;
|
||||
if (length > 16) {
|
||||
return TMCC_ERROR_OVERFLOW;
|
||||
}
|
||||
bitCount = work->bitCount;
|
||||
code <<= 1;
|
||||
bitData = work->bitBuf;
|
||||
bitCount--;
|
||||
work->bitCount = bitCount;
|
||||
code |= (bitData >> bitCount) & 1;
|
||||
read_entry:
|
||||
{
|
||||
TMCHuffmanEntry decoded = readHuffmanLimit(entry);
|
||||
if (code > (u32)decoded.bitLength) {
|
||||
continue;
|
||||
}
|
||||
code = code - entry->bitLength + entry->symbol;
|
||||
return symbols[code & 0xFF];
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
s32 TMCJPEGDEC_decode_iquant(s32* block, u8* conv_row_ptr, u32* dc_predict_row_ptr, TMCCJPEGDecWork* work) {
|
||||
TMCHuffmanEntry dcEntry;
|
||||
TMCHuffmanEntry acEntry;
|
||||
const TMCHuffmanEntry* ac_fast;
|
||||
u8* huff_sym;
|
||||
u32* huff_tbl;
|
||||
@@ -138,7 +49,7 @@ s32 TMCJPEGDEC_decode_iquant(s32* block, u8* conv_row_ptr, u32* dc_predict_row_p
|
||||
tmp = bit_pos - 8;
|
||||
tmp = ((bit_data >> tmp) & 0xFF) << 2;
|
||||
{
|
||||
dcEntry = readHuffmanEntry(dc_fast, tmp >> 2);
|
||||
TMCHuffmanEntry dcEntry = readHuffmanEntry(dc_fast, tmp >> 2);
|
||||
r = dcEntry.bitLength;
|
||||
extra = dcEntry.symbol;
|
||||
}
|
||||
@@ -148,11 +59,68 @@ s32 TMCJPEGDEC_decode_iquant(s32* block, u8* conv_row_ptr, u32* dc_predict_row_p
|
||||
work->bitCount = bit_pos;
|
||||
r = extra;
|
||||
} else {
|
||||
s32 dcResult;
|
||||
u32 code;
|
||||
unsigned int i;
|
||||
const TMCHuffmanEntry* entry;
|
||||
s32 thresh;
|
||||
s32 offs;
|
||||
|
||||
huff_sym = work->pDCHuffSym;
|
||||
huff_tbl = work->pDCHuffTbl;
|
||||
r = decodeLongHuffman(bit_pos, (const TMCHuffmanEntry*)huff_tbl, huff_sym, work);
|
||||
if (r < 0) {
|
||||
return r;
|
||||
|
||||
if (bit_pos <= 17) {
|
||||
dcResult = TMCJPEGDEC_load_buff(work);
|
||||
if (dcResult < 0) {
|
||||
goto dc_end;
|
||||
}
|
||||
}
|
||||
bit_pos = work->bitCount;
|
||||
bit_data = work->bitBuf;
|
||||
bit_pos -= 9;
|
||||
code = (bit_data >> bit_pos) & 0x1FF;
|
||||
work->bitCount = bit_pos;
|
||||
|
||||
i = 9;
|
||||
entry = (const TMCHuffmanEntry*)huff_tbl + 9;
|
||||
|
||||
goto dc_entry;
|
||||
|
||||
while (1) {
|
||||
i++;
|
||||
entry++;
|
||||
if (i > 16) {
|
||||
dcResult = TMCC_ERROR_OVERFLOW;
|
||||
goto dc_end;
|
||||
}
|
||||
|
||||
bit_pos = work->bitCount;
|
||||
code <<= 1;
|
||||
bit_data = work->bitBuf;
|
||||
bit_pos--;
|
||||
work->bitCount = bit_pos;
|
||||
code |= (bit_data >> bit_pos) & 1;
|
||||
|
||||
dc_entry:
|
||||
{
|
||||
TMCHuffmanEntry decoded = readHuffmanLimit(entry);
|
||||
thresh = decoded.bitLength;
|
||||
offs = entry->symbol;
|
||||
}
|
||||
|
||||
if (code > (u32)thresh) {
|
||||
continue;
|
||||
}
|
||||
|
||||
code = code - entry->bitLength + offs;
|
||||
dcResult = huff_sym[code & 0xFF];
|
||||
break;
|
||||
}
|
||||
|
||||
dc_end:
|
||||
r = dcResult;
|
||||
if (dcResult < 0) {
|
||||
return dcResult;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -164,8 +132,8 @@ s32 TMCJPEGDEC_decode_iquant(s32* block, u8* conv_row_ptr, u32* dc_predict_row_p
|
||||
if (load_ret < 0) {
|
||||
return load_ret;
|
||||
}
|
||||
bit_pos = work->bitCount;
|
||||
}
|
||||
bit_pos = work->bitCount;
|
||||
bit_data = work->bitBuf;
|
||||
tmp = 1 << r;
|
||||
extra = tmp - 1;
|
||||
@@ -181,6 +149,7 @@ s32 TMCJPEGDEC_decode_iquant(s32* block, u8* conv_row_ptr, u32* dc_predict_row_p
|
||||
*block = dc_predict_row_ptr[0] * blk0;
|
||||
|
||||
{
|
||||
TMCHuffmanEntry acEntry;
|
||||
ac_fast = (const TMCHuffmanEntry*)work->pACFast;
|
||||
huff_tbl = work->pACHuffTbl;
|
||||
huff_sym = work->pACHuffSym;
|
||||
@@ -201,7 +170,7 @@ s32 TMCJPEGDEC_decode_iquant(s32* block, u8* conv_row_ptr, u32* dc_predict_row_p
|
||||
t = bit_pos - 8;
|
||||
acEntry = readHuffmanEntry(ac_fast, (bit_data >> t) & 0xFF);
|
||||
|
||||
do {
|
||||
while (idx < 64) {
|
||||
s32 ac_thresh = acEntry.bitLength;
|
||||
if (ac_thresh != 0) {
|
||||
bit_pos = work->bitCount;
|
||||
@@ -209,8 +178,62 @@ s32 TMCJPEGDEC_decode_iquant(s32* block, u8* conv_row_ptr, u32* dc_predict_row_p
|
||||
work->bitCount = bit_pos;
|
||||
r = acEntry.symbol;
|
||||
} else {
|
||||
u32 code;
|
||||
unsigned int i;
|
||||
const TMCHuffmanEntry* entry;
|
||||
s32 thresh;
|
||||
s32 offs;
|
||||
|
||||
bit_pos = work->bitCount;
|
||||
r = decodeACHuffman(bit_pos, (const TMCHuffmanEntry*)huff_tbl, huff_sym, work);
|
||||
if (bit_pos <= 17) {
|
||||
r = TMCJPEGDEC_load_buff(work);
|
||||
if (r < 0) {
|
||||
return r;
|
||||
}
|
||||
bit_pos = work->bitCount;
|
||||
}
|
||||
bit_data = work->bitBuf;
|
||||
bit_pos -= 9;
|
||||
code = (bit_data >> bit_pos) & 0x1FF;
|
||||
work->bitCount = bit_pos;
|
||||
|
||||
i = 9;
|
||||
entry = (const TMCHuffmanEntry*)huff_tbl + 9;
|
||||
|
||||
goto ac_entry_huff;
|
||||
|
||||
while (1) {
|
||||
i++;
|
||||
entry++;
|
||||
if (i > 16) {
|
||||
r = TMCC_ERROR_OVERFLOW;
|
||||
goto ac_end;
|
||||
}
|
||||
|
||||
bit_pos = work->bitCount;
|
||||
code <<= 1;
|
||||
bit_data = work->bitBuf;
|
||||
bit_pos--;
|
||||
work->bitCount = bit_pos;
|
||||
code |= (bit_data >> bit_pos) & 1;
|
||||
|
||||
ac_entry_huff:
|
||||
{
|
||||
TMCHuffmanEntry decoded = readHuffmanLimit(entry);
|
||||
thresh = decoded.bitLength;
|
||||
offs = entry->symbol;
|
||||
}
|
||||
|
||||
if (code > (u32)thresh) {
|
||||
continue;
|
||||
}
|
||||
|
||||
code = code - entry->bitLength + offs;
|
||||
r = huff_sym[code & 0xFF];
|
||||
break;
|
||||
}
|
||||
|
||||
ac_end:
|
||||
if (r < 0) {
|
||||
return r;
|
||||
}
|
||||
@@ -233,8 +256,8 @@ s32 TMCJPEGDEC_decode_iquant(s32* block, u8* conv_row_ptr, u32* dc_predict_row_p
|
||||
if (r < 0) {
|
||||
return r;
|
||||
}
|
||||
bit_pos = work->bitCount;
|
||||
}
|
||||
bit_pos = work->bitCount;
|
||||
tmp = 1 << t;
|
||||
bit_data = work->bitBuf;
|
||||
extra = tmp - 1;
|
||||
@@ -242,14 +265,14 @@ s32 TMCJPEGDEC_decode_iquant(s32* block, u8* conv_row_ptr, u32* dc_predict_row_p
|
||||
work->bitCount = bit_pos;
|
||||
t = bit_pos - 8;
|
||||
extra = extra & (bit_data >> bit_pos);
|
||||
q = ((s32*)conv_row_ptr)[(u8)zz];
|
||||
acEntry = readHuffmanEntry(ac_fast, (bit_data >> t) & 0xFF);
|
||||
|
||||
if (((s32)tmp >> 1) > extra) {
|
||||
extra -= tmp - 1;
|
||||
}
|
||||
|
||||
block[(u8)zz] = extra * q;
|
||||
q = ((s32*)conv_row_ptr)[zz];
|
||||
block[zz] = extra * q;
|
||||
|
||||
idx++;
|
||||
} else {
|
||||
@@ -271,7 +294,7 @@ s32 TMCJPEGDEC_decode_iquant(s32* block, u8* conv_row_ptr, u32* dc_predict_row_p
|
||||
|
||||
idx += 16;
|
||||
}
|
||||
} while (idx < 64);
|
||||
}
|
||||
|
||||
if (idx > 64) {
|
||||
return TMCC_ERROR_OVERFLOW;
|
||||
|
||||
@@ -1,28 +1,30 @@
|
||||
#include <string.h>
|
||||
#include <tmc_jpeg_internal.h>
|
||||
|
||||
static s32 clampU8(s32 v) {
|
||||
static u8 clampU8(s32 v) {
|
||||
s32 ok;
|
||||
ok = 0;
|
||||
if (v < 256 && v > -1) {
|
||||
ok = 1;
|
||||
}
|
||||
return ok ? v : (v < 0 ? 0 : 255);
|
||||
return ok ? v : 255 & ~(v >> 31);
|
||||
}
|
||||
|
||||
static s32 clampS8(s32 v) {
|
||||
static s8 clampS8(s32 v) {
|
||||
s32 inRange = 0;
|
||||
if (v < 128 && v > -129) {
|
||||
inRange = 1;
|
||||
}
|
||||
return inRange ? v : (v > 0) ? 127 : -128;
|
||||
return inRange ? (s8)v : (v > 0) ? 127 : -128;
|
||||
}
|
||||
|
||||
static s32 scalingClampU8(s32 value) {
|
||||
if ((value >> 19) == 0) {
|
||||
return value >> 11;
|
||||
}
|
||||
return value < 0 ? 0 : 255;
|
||||
static s32 scalingClampU8(s32 val) {
|
||||
s32 result;
|
||||
if (val >> 19 != 0)
|
||||
result = ~(val >> 31) & 0xFF;
|
||||
else
|
||||
result = (val >> 11);
|
||||
return result;
|
||||
}
|
||||
|
||||
void TMCJPEGDEC_IdctBlock_Lumi(s32* block, u8* conv_row_ptr, u16 pitch, s32 zigzag) {
|
||||
@@ -31,35 +33,13 @@ void TMCJPEGDEC_IdctBlock_Lumi(s32* block, u8* conv_row_ptr, u16 pitch, s32 zigz
|
||||
s32 done;
|
||||
s32 iter;
|
||||
s32 i;
|
||||
s32 e;
|
||||
s32 b2;
|
||||
s32 b3;
|
||||
s32 b4;
|
||||
s32 b5;
|
||||
s32 b6;
|
||||
s32 b7;
|
||||
s32 v;
|
||||
s32 m;
|
||||
s32 a;
|
||||
s32 d;
|
||||
s32 z;
|
||||
s32 o;
|
||||
s32 p;
|
||||
s32 p_part;
|
||||
s32 t;
|
||||
s32 u;
|
||||
s32 r;
|
||||
s32 n;
|
||||
s32 y;
|
||||
s32 x_factor;
|
||||
s32 z_factor;
|
||||
s32 m_part;
|
||||
s32 q;
|
||||
s32 w;
|
||||
s32 x;
|
||||
s32 b1;
|
||||
s32 b1, b2, b3, b4, b5, b6, b7;
|
||||
s32 v, e, a, d, n, o, p, q, t, u, w, x, y;
|
||||
s32 x_factor, z_factor, m_part, p_part;
|
||||
s32 r, z, m;
|
||||
|
||||
r = (zigzag >> 4) * 8;
|
||||
iter = (u32)(r + 7) >> 3;
|
||||
dst = tmp;
|
||||
done = 0;
|
||||
{
|
||||
@@ -91,41 +71,28 @@ void TMCJPEGDEC_IdctBlock_Lumi(s32* block, u8* conv_row_ptr, u16 pitch, s32 zigz
|
||||
dst[1] = val;
|
||||
dst[0] = val;
|
||||
} else {
|
||||
s32 oddLowSum;
|
||||
s32 oddHighSum;
|
||||
s32 dcValue;
|
||||
|
||||
t = b2 - b6;
|
||||
oddLowSum = b5 + b3;
|
||||
b5 = b5 - b3;
|
||||
oddHighSum = b1 + b7;
|
||||
b1 = b1 - b7;
|
||||
u = b6 + b2;
|
||||
t = t * 0xB5 >> 8;
|
||||
x_factor = oddHighSum - oddLowSum;
|
||||
z_factor = b5 + b1;
|
||||
dcValue = block[0];
|
||||
a = dcValue - b4;
|
||||
x = x_factor * 0xB5 >> 8;
|
||||
d = dcValue + b4;
|
||||
u = t + u;
|
||||
t = (b2 - b6) * 0xB5 >> 8;
|
||||
a = block[0] - b4;
|
||||
d = block[0] + b4;
|
||||
u = t + (b6 + b2);
|
||||
v = a + t;
|
||||
z = z_factor * 0x62 >> 8;
|
||||
w = d + u;
|
||||
y = d - u;
|
||||
m_part = b1 * 0x14E >> 8;
|
||||
e = a - t;
|
||||
w = d + u;
|
||||
x_factor = (b1 + b7) - (b5 + b3);
|
||||
y = d - u;
|
||||
z_factor = (b5 - b3) + (b1 - b7);
|
||||
m_part = (b1 - b7) * 0x14E >> 8;
|
||||
p_part = (b5 - b3) * 0x8B >> 8;
|
||||
x = x_factor * 0xB5 >> 8;
|
||||
z = z_factor * 0x62 >> 8;
|
||||
m = m_part - z;
|
||||
oddLowSum += m;
|
||||
n = oddHighSum + oddLowSum;
|
||||
n = (b1 + b7) + ((b5 + b3) + m);
|
||||
o = x + m;
|
||||
dst[0] = w + n;
|
||||
p_part = b5 * 0x8B;
|
||||
dst[7] = w - n;
|
||||
p_part >>= 8;
|
||||
dst[1] = v + o;
|
||||
p = z + p_part;
|
||||
q = p + x;
|
||||
q = x + p;
|
||||
dst[0] = w + n;
|
||||
dst[7] = w - n;
|
||||
dst[1] = v + o;
|
||||
dst[6] = v - o;
|
||||
dst[2] = e + q;
|
||||
dst[5] = e - q;
|
||||
@@ -178,37 +145,25 @@ void TMCJPEGDEC_IdctBlock_Lumi(s32* block, u8* conv_row_ptr, u16 pitch, s32 zigz
|
||||
out[pitch] = val;
|
||||
out[0] = val;
|
||||
} else {
|
||||
s32 oddLowSum;
|
||||
s32 oddHighSum;
|
||||
s32 dcValue;
|
||||
|
||||
t = b2 - b6;
|
||||
oddLowSum = b5 + b3;
|
||||
b5 = b5 - b3;
|
||||
oddHighSum = b1 + b7;
|
||||
b1 = b1 - b7;
|
||||
u = b6 + b2;
|
||||
b2 = t * 0xB5 >> 8;
|
||||
x_factor = oddHighSum - oddLowSum;
|
||||
z_factor = b5 + b1;
|
||||
dcValue = *dst + 0x40000;
|
||||
a = dcValue - b4;
|
||||
x = x_factor * 0xB5 >> 8;
|
||||
d = dcValue + b4;
|
||||
u = b2 + u;
|
||||
v = a + b2;
|
||||
z_factor = z_factor * 0x62 >> 8;
|
||||
t = (b2 - b6) * 0xB5 >> 8;
|
||||
a = (*dst + 0x40000) - b4;
|
||||
d = (*dst + 0x40000) + b4;
|
||||
u = t + (b6 + b2);
|
||||
v = a + t;
|
||||
e = a - t;
|
||||
w = d + u;
|
||||
x_factor = (b1 + b7) - (b5 + b3);
|
||||
x = x_factor * 0xB5 >> 8;
|
||||
y = d - u;
|
||||
m_part = b1 * 0x14E >> 8;
|
||||
e = a - b2;
|
||||
m_part = m_part - z_factor;
|
||||
oddLowSum += m_part;
|
||||
n = oddHighSum + oddLowSum;
|
||||
|
||||
z_factor = ((b5 - b3) + (b1 - b7)) * 0x62 >> 8;
|
||||
m_part = ((b1 - b7) * 0x14E >> 8) - z_factor;
|
||||
|
||||
n = (b1 + b7) + ((b5 + b3) + m_part);
|
||||
o = x + m_part;
|
||||
p_part = b5 * 0x8B >> 8;
|
||||
p = z_factor + p_part;
|
||||
q = p + x;
|
||||
p = ((b5 - b3) * 0x8B >> 8) + z_factor;
|
||||
q = x + p;
|
||||
|
||||
out[0] = scalingClampU8(w + n);
|
||||
out[r] = scalingClampU8(w - n);
|
||||
out[pitch] = scalingClampU8(v + o);
|
||||
@@ -227,34 +182,11 @@ void TMCJPEGDEC_IdctBlock_Col(s32* block, u8* conv_row_ptr, u16 pitch, s32 zigza
|
||||
s32* dst;
|
||||
s32 done;
|
||||
s32 iter;
|
||||
s32 d;
|
||||
s32 b1;
|
||||
s32 b2;
|
||||
s32 b3;
|
||||
s32 b4;
|
||||
s32 b5;
|
||||
s32 b6;
|
||||
s32 b7;
|
||||
s32 v;
|
||||
s32 r;
|
||||
s32 a;
|
||||
s32 i;
|
||||
s32 m;
|
||||
s32 n;
|
||||
s32 o;
|
||||
s32 x;
|
||||
s32 q;
|
||||
s32 y;
|
||||
s32 u;
|
||||
s32 w;
|
||||
s32 p;
|
||||
s32 t;
|
||||
s32 z;
|
||||
s32 x_factor;
|
||||
s32 z_factor;
|
||||
s32 m_part;
|
||||
s32 p_part;
|
||||
s32 e;
|
||||
s32 b1, b2, b3, b4, b5, b6, b7;
|
||||
s32 v, e, a, d, m, n, o, p, q, t, u, w, x, y, z;
|
||||
s32 x_factor, z_factor, m_part, p_part;
|
||||
s32 r;
|
||||
|
||||
if (zigzag == 0x11) {
|
||||
s32 val;
|
||||
@@ -268,42 +200,90 @@ void TMCJPEGDEC_IdctBlock_Col(s32* block, u8* conv_row_ptr, u16 pitch, s32 zigza
|
||||
goto mode_gt_2;
|
||||
}
|
||||
|
||||
dst = tmp;
|
||||
done = 0;
|
||||
for (; done < r; done += 8) {
|
||||
s32 dcValue;
|
||||
s32 oddCoefficient;
|
||||
{
|
||||
s32 inner;
|
||||
|
||||
oddCoefficient = block[1];
|
||||
dcValue = block[0];
|
||||
t = oddCoefficient * 0xB5 >> 8;
|
||||
v = oddCoefficient * 0x62 >> 8;
|
||||
u = v + t;
|
||||
z = (oddCoefficient * 0x14E >> 8) - v;
|
||||
m = oddCoefficient + z;
|
||||
n = t + z;
|
||||
dst[0] = dcValue + m;
|
||||
dst[7] = dcValue - m;
|
||||
dst[1] = dcValue + n;
|
||||
dst[6] = dcValue - n;
|
||||
dst[2] = dcValue + u;
|
||||
dst[5] = dcValue - u;
|
||||
dst[3] = dcValue + v;
|
||||
dst[4] = dcValue - v;
|
||||
dst += 8;
|
||||
block += 8;
|
||||
}
|
||||
dst = tmp + done;
|
||||
for (; done <= 0x38; done += 8) {
|
||||
memset(dst, 0, 0x20);
|
||||
dst += 8;
|
||||
dst = tmp;
|
||||
done = 0;
|
||||
iter = (r + 7) >> 3;
|
||||
if (r > 0) {
|
||||
inner = (r + 7) >> 4;
|
||||
done = iter << 3;
|
||||
if (inner != 0) {
|
||||
for (; inner > 0; inner--) {
|
||||
t = block[1] * 0xB5 >> 8;
|
||||
v = block[1] * 0x62 >> 8;
|
||||
u = v + t;
|
||||
z = (block[1] * 0x14E >> 8) - v;
|
||||
m = block[1] + z;
|
||||
n = t + z;
|
||||
b1 = block[0] + m;
|
||||
dst[0] = b1;
|
||||
dst[7] = block[0] - m;
|
||||
dst[1] = block[0] + n;
|
||||
dst[6] = block[0] - n;
|
||||
dst[2] = block[0] + u;
|
||||
dst[5] = block[0] - u;
|
||||
dst[3] = block[0] + v;
|
||||
dst[4] = block[0] - v;
|
||||
|
||||
t = block[9] * 0xB5 >> 8;
|
||||
v = block[9] * 0x62 >> 8;
|
||||
u = v + t;
|
||||
z = (block[9] * 0x14E >> 8) - v;
|
||||
m = block[9] + z;
|
||||
n = t + z;
|
||||
b2 = block[8] + m;
|
||||
dst[8] = b2;
|
||||
dst[15] = block[8] - m;
|
||||
dst[9] = block[8] + n;
|
||||
dst[14] = block[8] - n;
|
||||
dst[10] = block[8] + u;
|
||||
dst[13] = block[8] - u;
|
||||
dst[11] = block[8] + v;
|
||||
dst[12] = block[8] - v;
|
||||
dst += 0x10;
|
||||
block += 0x10;
|
||||
}
|
||||
iter = iter & 1;
|
||||
if (iter == 0) {
|
||||
goto zero_fill;
|
||||
}
|
||||
}
|
||||
for (; iter > 0; iter--) {
|
||||
t = block[1] * 0xB5 >> 8;
|
||||
v = block[1] * 0x62 >> 8;
|
||||
u = v + t;
|
||||
z = (block[1] * 0x14E >> 8) - v;
|
||||
m = block[1] + z;
|
||||
n = t + z;
|
||||
b1 = block[0] + m;
|
||||
dst[0] = b1;
|
||||
dst[7] = block[0] - m;
|
||||
dst[1] = block[0] + n;
|
||||
dst[6] = block[0] - n;
|
||||
dst[2] = block[0] + u;
|
||||
dst[5] = block[0] - u;
|
||||
dst[3] = block[0] + v;
|
||||
dst[4] = block[0] - v;
|
||||
dst += 8;
|
||||
block += 8;
|
||||
}
|
||||
}
|
||||
zero_fill:
|
||||
dst = tmp + done;
|
||||
for (; done <= 0x38; done += 8) {
|
||||
memset(dst, 0, 0x20);
|
||||
dst += 8;
|
||||
}
|
||||
}
|
||||
goto epilogue;
|
||||
|
||||
mode_gt_2:
|
||||
dst = tmp;
|
||||
done = 0;
|
||||
for (; done < r; done += 8) {
|
||||
if (r > 0) {
|
||||
for (iter = (r + 7) >> 3; iter > 0; iter--) {
|
||||
u32 ac;
|
||||
b4 = block[4];
|
||||
b6 = block[6];
|
||||
@@ -332,43 +312,28 @@ mode_gt_2:
|
||||
dst[1] = val;
|
||||
dst[0] = val;
|
||||
} else {
|
||||
s32 oddLowSum;
|
||||
s32 oddLowDifference;
|
||||
s32 oddHighSum;
|
||||
s32 oddHighDifference;
|
||||
s32 dcValue;
|
||||
|
||||
t = b2 - b6;
|
||||
oddLowSum = b5 + b3;
|
||||
oddLowDifference = b5 - b3;
|
||||
oddHighSum = b1 + b7;
|
||||
oddHighDifference = b1 - b7;
|
||||
u = b6 + b2;
|
||||
t = t * 0xB5 >> 8;
|
||||
x_factor = oddHighSum - oddLowSum;
|
||||
z_factor = oddLowDifference + oddHighDifference;
|
||||
dcValue = block[0];
|
||||
a = dcValue - b4;
|
||||
x = x_factor * 0xB5 >> 8;
|
||||
d = dcValue + b4;
|
||||
u = t + u;
|
||||
t = (b2 - b6) * 0xB5 >> 8;
|
||||
a = block[0] - b4;
|
||||
d = block[0] + b4;
|
||||
u = t + (b6 + b2);
|
||||
v = a + t;
|
||||
z = z_factor * 0x62 >> 8;
|
||||
w = d + u;
|
||||
y = d - u;
|
||||
m_part = oddHighDifference * 0x14E >> 8;
|
||||
e = a - t;
|
||||
w = d + u;
|
||||
x_factor = (b1 + b7) - (b5 + b3);
|
||||
y = d - u;
|
||||
z_factor = (b5 - b3) + (b1 - b7);
|
||||
m_part = (b1 - b7) * 0x14E >> 8;
|
||||
p_part = (b5 - b3) * 0x8B >> 8;
|
||||
x = x_factor * 0xB5 >> 8;
|
||||
z = z_factor * 0x62 >> 8;
|
||||
m = m_part - z;
|
||||
oddLowSum += m;
|
||||
n = oddHighSum + oddLowSum;
|
||||
n = (b1 + b7) + ((b5 + b3) + m);
|
||||
o = x + m;
|
||||
dst[0] = w + n;
|
||||
p_part = oddLowDifference * 0x8B;
|
||||
dst[7] = w - n;
|
||||
p_part >>= 8;
|
||||
dst[1] = v + o;
|
||||
p = z + p_part;
|
||||
q = p + x;
|
||||
dst[0] = w + n;
|
||||
dst[7] = w - n;
|
||||
dst[1] = v + o;
|
||||
dst[6] = v - o;
|
||||
dst[2] = e + q;
|
||||
dst[5] = e - q;
|
||||
@@ -377,6 +342,8 @@ mode_gt_2:
|
||||
}
|
||||
block += 8;
|
||||
dst += 8;
|
||||
done += 8;
|
||||
}
|
||||
}
|
||||
|
||||
dst = tmp + done;
|
||||
@@ -390,9 +357,7 @@ epilogue:
|
||||
dst = tmp + 7;
|
||||
for (iter = 8, i = 7; iter > 0; iter--, i--) {
|
||||
u32 ac;
|
||||
u8* output;
|
||||
b4 = dst[0x20];
|
||||
output = conv_row_ptr + i;
|
||||
b6 = dst[0x30];
|
||||
b2 = dst[0x10];
|
||||
b1 = dst[8];
|
||||
@@ -410,56 +375,42 @@ epilogue:
|
||||
if (ac == 0) {
|
||||
s32 val;
|
||||
val = clampS8(*dst >> 11);
|
||||
output[56] = (u8)val;
|
||||
output[48] = (u8)val;
|
||||
output[40] = (u8)val;
|
||||
output[32] = (u8)val;
|
||||
output[24] = (u8)val;
|
||||
output[16] = (u8)val;
|
||||
output[8] = (u8)val;
|
||||
output[0] = (u8)val;
|
||||
conv_row_ptr[i + 56] = (u8)val;
|
||||
conv_row_ptr[i + 48] = (u8)val;
|
||||
conv_row_ptr[i + 40] = (u8)val;
|
||||
conv_row_ptr[i + 32] = (u8)val;
|
||||
conv_row_ptr[i + 24] = (u8)val;
|
||||
conv_row_ptr[i + 16] = (u8)val;
|
||||
conv_row_ptr[i + 8] = (u8)val;
|
||||
conv_row_ptr[i] = (u8)val;
|
||||
} else {
|
||||
s32 oddLowSum;
|
||||
s32 oddLowDifference;
|
||||
s32 oddHighSum;
|
||||
s32 oddHighDifference;
|
||||
s32 dcValue;
|
||||
|
||||
t = b2 - b6;
|
||||
oddLowSum = b5 + b3;
|
||||
oddLowDifference = b5 - b3;
|
||||
oddHighSum = b1 + b7;
|
||||
oddHighDifference = b1 - b7;
|
||||
u = b6 + b2;
|
||||
t = t * 0xB5 >> 8;
|
||||
x_factor = oddHighSum - oddLowSum;
|
||||
z_factor = oddLowDifference + oddHighDifference;
|
||||
dcValue = *dst;
|
||||
a = dcValue - b4;
|
||||
x = x_factor * 0xB5 >> 8;
|
||||
d = dcValue + b4;
|
||||
u = t + u;
|
||||
t = (b2 - b6) * 0xB5 >> 8;
|
||||
a = *dst - b4;
|
||||
d = *dst + b4;
|
||||
u = t + (b6 + b2);
|
||||
v = a + t;
|
||||
z = z_factor * 0x62 >> 8;
|
||||
w = d + u;
|
||||
y = d - u;
|
||||
m_part = oddHighDifference * 0x14E >> 8;
|
||||
e = a - t;
|
||||
m = m_part - z;
|
||||
oddLowSum += m;
|
||||
n = oddHighSum + oddLowSum;
|
||||
w = d + u;
|
||||
x_factor = (b1 + b7) - (b5 + b3);
|
||||
x = x_factor * 0xB5 >> 8;
|
||||
y = d - u;
|
||||
z_factor = (b5 - b3) + (b1 - b7);
|
||||
z = z_factor * 0x62 >> 8;
|
||||
m = ((b1 - b7) * 0x14E >> 8) - z;
|
||||
n = (b1 + b7) + ((b5 + b3) + m);
|
||||
o = x + m;
|
||||
p_part = oddLowDifference * 0x8B >> 8;
|
||||
p = z + p_part;
|
||||
|
||||
p = z + ((b5 - b3) * 0x8B >> 8);
|
||||
q = p + x;
|
||||
output[0] = (u8)clampS8((w + n) >> 11);
|
||||
output[56] = (u8)clampS8((w - n) >> 11);
|
||||
output[8] = (u8)clampS8((v + o) >> 11);
|
||||
output[48] = (u8)clampS8((v - o) >> 11);
|
||||
output[16] = (u8)clampS8((e + q) >> 11);
|
||||
output[40] = (u8)clampS8((e - q) >> 11);
|
||||
output[24] = (u8)clampS8((y + p) >> 11);
|
||||
output[32] = (u8)clampS8((y - p) >> 11);
|
||||
|
||||
conv_row_ptr[i] = (u8)clampS8((w + n) >> 11);
|
||||
conv_row_ptr[i + 56] = (u8)clampS8((w - n) >> 11);
|
||||
conv_row_ptr[i + 8] = (u8)clampS8((v + o) >> 11);
|
||||
conv_row_ptr[i + 48] = (u8)clampS8((v - o) >> 11);
|
||||
conv_row_ptr[i + 16] = (u8)clampS8((e + q) >> 11);
|
||||
conv_row_ptr[i + 40] = (u8)clampS8((e - q) >> 11);
|
||||
conv_row_ptr[i + 24] = (u8)clampS8((y + p) >> 11);
|
||||
conv_row_ptr[i + 32] = (u8)clampS8((y - p) >> 11);
|
||||
}
|
||||
dst--;
|
||||
}
|
||||
|
||||
@@ -244,11 +244,6 @@ _error:
|
||||
static s32 TMCJPEGDEC_exif_parse(const u8* data, u32 size, TMCCJPEGDecExifData* pInfo) {
|
||||
u16 byteOrder;
|
||||
u32 ifdOffset;
|
||||
const u8* entries;
|
||||
u16 remaining;
|
||||
u16 count;
|
||||
s32 entriesSize;
|
||||
u16 index;
|
||||
pInfo->thumbnailData = (u8*)data;
|
||||
pInfo->dataEnd = (u8*)data + size;
|
||||
pInfo->nextIfdOffset = 0;
|
||||
@@ -267,8 +262,11 @@ static s32 TMCJPEGDEC_exif_parse(const u8* data, u32 size, TMCCJPEGDecExifData*
|
||||
return -161;
|
||||
}
|
||||
{
|
||||
entries = data + ifdOffset;
|
||||
remaining = size - (u16)ifdOffset;
|
||||
const u8* entries = data + ifdOffset;
|
||||
u16 remaining = size - (u16)ifdOffset;
|
||||
u16 count;
|
||||
s32 entriesSize;
|
||||
u16 index;
|
||||
if (remaining < 2) {
|
||||
return -161;
|
||||
}
|
||||
@@ -296,8 +294,11 @@ static s32 TMCJPEGDEC_exif_parse(const u8* data, u32 size, TMCCJPEGDecExifData*
|
||||
return -161;
|
||||
}
|
||||
{
|
||||
entries = data + ifdOffset;
|
||||
remaining = size - (u16)ifdOffset;
|
||||
const u8* entries = data + ifdOffset;
|
||||
u16 remaining = size - (u16)ifdOffset;
|
||||
u16 count;
|
||||
s32 entriesSize;
|
||||
u16 index;
|
||||
if (remaining < 2) {
|
||||
return -161;
|
||||
}
|
||||
@@ -318,8 +319,11 @@ static s32 TMCJPEGDEC_exif_parse(const u8* data, u32 size, TMCCJPEGDecExifData*
|
||||
return -161;
|
||||
}
|
||||
{
|
||||
entries = data + ifdOffset;
|
||||
remaining = size - (u16)ifdOffset;
|
||||
const u8* entries = data + ifdOffset;
|
||||
u16 remaining = size - (u16)ifdOffset;
|
||||
u16 count;
|
||||
s32 entriesSize;
|
||||
u16 index;
|
||||
if (remaining < 2) {
|
||||
return -161;
|
||||
}
|
||||
@@ -350,7 +354,7 @@ static void TMCJPEGDEC_IFD0_tag_parse(TMCCJPEGDecExifData* pInfo, u16 byteOrder,
|
||||
case 0x0111:
|
||||
case 0x0201:
|
||||
case 0x0202: {
|
||||
break;
|
||||
return;
|
||||
}
|
||||
case 0x0112: {
|
||||
pInfo->orientation = readU16(entry + 8, byteOrder);
|
||||
@@ -470,19 +474,21 @@ static void TMCJPEGDEC_IFD0_tag_parse(TMCCJPEGDecExifData* pInfo, u16 byteOrder,
|
||||
return;
|
||||
}
|
||||
case 0xA002: {
|
||||
if (type == 3) {
|
||||
u32 offset = readU32(entry + 8, byteOrder);
|
||||
if (type == 4) {
|
||||
pInfo->pixelXDim = offset;
|
||||
} else if (type == 3) {
|
||||
pInfo->pixelXDim = readU16(entry + 8, byteOrder);
|
||||
} else if (type == 4) {
|
||||
pInfo->pixelXDim = readU32(entry + 8, byteOrder);
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
case 0xA003: {
|
||||
if (type == 3) {
|
||||
u32 offset = readU32(entry + 8, byteOrder);
|
||||
if (type == 4) {
|
||||
pInfo->pixelYDim = offset;
|
||||
} else if (type == 3) {
|
||||
pInfo->pixelYDim = readU16(entry + 8, byteOrder);
|
||||
} else if (type == 4) {
|
||||
pInfo->pixelYDim = readU32(entry + 8, byteOrder);
|
||||
}
|
||||
return;
|
||||
}
|
||||
@@ -502,7 +508,7 @@ static void TMCJPEGDEC_IFD1_tag_parse(TMCCJPEGDecExifData* pInfo, u16 byteOrder,
|
||||
case 0x9000:
|
||||
case 0x9101:
|
||||
case 0xA003: {
|
||||
break;
|
||||
return;
|
||||
}
|
||||
case 0x011A: {
|
||||
u32 offset;
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
extern void* memset(void* dest, s32 val, u32 count);
|
||||
|
||||
extern const u32 scJpegAanScale[64] = {
|
||||
extern const u32 lbl_8161E080[64] = {
|
||||
0x00000100, 0x000000B9, 0x000000C4, 0x000000DA, 0x00000100, 0x00000146, 0x000001D9, 0x000003A0, 0x000000B9, 0x00000085, 0x0000008D,
|
||||
0x0000009D, 0x000000B9, 0x000000EB, 0x00000155, 0x0000029D, 0x000000C4, 0x0000008D, 0x00000096, 0x000000A7, 0x000000C4, 0x000000F9,
|
||||
0x0000016A, 0x000002C6, 0x000000DA, 0x0000009D, 0x000000A7, 0x000000B9, 0x000000DA, 0x00000115, 0x00000192, 0x00000315, 0x00000100,
|
||||
@@ -1411,22 +1411,131 @@ static s32 TMCJPEGDEC_parse_dht(s32 first, TMCCJPEGDecWork* work) {
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifdef __MWERKS__
|
||||
static asm s32 TMCJPEGDEC_parse_dqt(register TMCCJPEGDecWork* work) {
|
||||
nofralloc
|
||||
|
||||
stwu r1, -0x130(r1)
|
||||
mflr r0
|
||||
lis r4, lbl_8161E080@ha
|
||||
stw r0, 0x134(r1)
|
||||
addi r4, r4, lbl_8161E080@l
|
||||
li r0, 0x20
|
||||
addi r6, r1, 0xc
|
||||
stmw r24, 0x110(r1)
|
||||
mr r30, r3
|
||||
addi r5, r4, -4
|
||||
mtctr r0
|
||||
|
||||
_parse_dqt_copy:
|
||||
lwz r4, 4(r5)
|
||||
lwzu r0, 8(r5)
|
||||
stw r4, 4(r6)
|
||||
stwu r0, 8(r6)
|
||||
bdnz _parse_dqt_copy
|
||||
|
||||
addi r31, r3, 0x58
|
||||
mr r4, r30
|
||||
addi r3, r1, 0xa
|
||||
bl TMCJPEGDEC_get_wbyte
|
||||
cmpwi r3, 0
|
||||
bge _parse_dqt_have_length
|
||||
b _parse_dqt_return
|
||||
|
||||
_parse_dqt_have_length:
|
||||
lhz r3, 0xa(r1)
|
||||
addi r29, r1, 0x10
|
||||
li r27, 1
|
||||
lis r28, TMCJPEGDEC_Zigzag_data@ha
|
||||
addi r0, r3, -2
|
||||
sth r0, 0xa(r1)
|
||||
|
||||
_parse_dqt_table:
|
||||
lhz r5, 0xa(r1)
|
||||
mr r4, r30
|
||||
addi r3, r1, 9
|
||||
addi r0, r5, -0x41
|
||||
sth r0, 0xa(r1)
|
||||
bl TMCJPEGDEC_get_byte
|
||||
cmpwi r3, 0
|
||||
bge _parse_dqt_have_qt_info
|
||||
b _parse_dqt_return
|
||||
|
||||
_parse_dqt_have_qt_info:
|
||||
lbz r0, 9(r1)
|
||||
cmplwi r0, 4
|
||||
ble _parse_dqt_valid_qt_info
|
||||
li r3, -0x41
|
||||
b _parse_dqt_return
|
||||
|
||||
_parse_dqt_valid_qt_info:
|
||||
add r3, r31, r0
|
||||
addi r26, r28, TMCJPEGDEC_Zigzag_data@l
|
||||
stb r27, 0x1790(r3)
|
||||
li r25, 0
|
||||
|
||||
_parse_dqt_coeff:
|
||||
lbz r24, 0(r26)
|
||||
cmpwi r24, 0x3f
|
||||
ble _parse_dqt_valid_coeff
|
||||
li r3, -0x41
|
||||
b _parse_dqt_return
|
||||
|
||||
_parse_dqt_valid_coeff:
|
||||
mr r4, r30
|
||||
addi r3, r1, 8
|
||||
bl TMCJPEGDEC_get_byte
|
||||
cmpwi r3, 0
|
||||
bge _parse_dqt_have_coeff
|
||||
b _parse_dqt_return
|
||||
|
||||
_parse_dqt_have_coeff:
|
||||
slwi r4, r24, 2
|
||||
lbz r3, 9(r1)
|
||||
add r0, r4, r31
|
||||
lbz r5, 8(r1)
|
||||
lwzx r4, r29, r4
|
||||
slwi r3, r3, 8
|
||||
mullw. r4, r5, r4
|
||||
stwx r4, r3, r0
|
||||
bne _parse_dqt_nonzero
|
||||
li r3, -0x41
|
||||
b _parse_dqt_return
|
||||
|
||||
_parse_dqt_nonzero:
|
||||
addi r25, r25, 1
|
||||
addi r26, r26, 1
|
||||
cmpwi r25, 0x40
|
||||
blt _parse_dqt_coeff
|
||||
lhz r0, 0xa(r1)
|
||||
cmpwi r0, 0
|
||||
bne _parse_dqt_table
|
||||
li r3, 0
|
||||
|
||||
_parse_dqt_return:
|
||||
lmw r24, 0x110(r1)
|
||||
lwz r0, 0x134(r1)
|
||||
mtlr r0
|
||||
addi r1, r1, 0x130
|
||||
blr
|
||||
}
|
||||
#else
|
||||
static s32 TMCJPEGDEC_parse_dqt(TMCCJPEGDecWork* work) {
|
||||
typedef struct {
|
||||
u32 data[64];
|
||||
} CopyBlock64;
|
||||
|
||||
typedef struct { u32 coefficients[4][64]; } QuantizationTables;
|
||||
QuantizationTables* scaleInfo;
|
||||
u32 tblCopy[64];
|
||||
u8* scaleInfo;
|
||||
u32 tblCopy[65];
|
||||
u32* tblPtr;
|
||||
u32* d;
|
||||
u16 len;
|
||||
s32 r;
|
||||
|
||||
d = tblCopy;
|
||||
*(CopyBlock64*)d = *(CopyBlock64*)scJpegAanScale;
|
||||
*(CopyBlock64*)(d + 1) = *(CopyBlock64*)lbl_8161E080;
|
||||
|
||||
scaleInfo = (QuantizationTables*)&work->scaleFlag;
|
||||
scaleInfo = (u8*)work + 0x58;
|
||||
|
||||
r = TMCJPEGDEC_get_wbyte(&len, work);
|
||||
if (r < 0) {
|
||||
@@ -1434,6 +1543,8 @@ static s32 TMCJPEGDEC_parse_dqt(TMCCJPEGDecWork* work) {
|
||||
}
|
||||
len -= 2;
|
||||
|
||||
tblPtr = &tblCopy[1];
|
||||
|
||||
do {
|
||||
u8 qtInfo;
|
||||
const u8* zigPtr;
|
||||
@@ -1452,10 +1563,11 @@ static s32 TMCJPEGDEC_parse_dqt(TMCCJPEGDecWork* work) {
|
||||
return -0x41;
|
||||
}
|
||||
|
||||
((TMCUnknownInfo*)scaleInfo)->quantTblFlag[qtInfo] = 1;
|
||||
scaleInfo[qtInfo + 0x1790] = 1; // quantTblFlag[0..3]
|
||||
|
||||
zigPtr = TMCJPEGDEC_Zigzag_data;
|
||||
for (zzIdx = 0; zzIdx < 64; zzIdx++) {
|
||||
u32 tmp;
|
||||
|
||||
zz = *zigPtr;
|
||||
if (zz > 0x3F) {
|
||||
@@ -1467,8 +1579,9 @@ static s32 TMCJPEGDEC_parse_dqt(TMCCJPEGDecWork* work) {
|
||||
return r;
|
||||
}
|
||||
|
||||
val = (u32)byte * tblCopy[zz];
|
||||
scaleInfo->coefficients[qtInfo][zz] = val;
|
||||
tmp = (zz << 2) + ((u32)qtInfo << 8);
|
||||
val = (u32)byte * tblPtr[zz];
|
||||
*(u32*)(tmp + scaleInfo) = val;
|
||||
if (val == 0) {
|
||||
return -0x41;
|
||||
}
|
||||
@@ -1479,6 +1592,7 @@ static s32 TMCJPEGDEC_parse_dqt(TMCCJPEGDecWork* work) {
|
||||
|
||||
return 0;
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifdef __MWERKS__
|
||||
static asm s32 TMCJPEGDEC_parse_sof(register TMCCJPEGDecWork* work) {
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -142,9 +142,6 @@ typedef struct ziFuzzyZYPairs {
|
||||
int rANDn : 1;
|
||||
int bANDp : 1;
|
||||
int gANDk : 1;
|
||||
int dANDt : 1;
|
||||
|
||||
int reserved : 20;
|
||||
} ziFuzzyZYPairs;
|
||||
|
||||
typedef struct _ziGetParam {
|
||||
@@ -360,8 +357,8 @@ typedef struct ziMatchParam {
|
||||
ziWChar first2; // 0x68
|
||||
ziWChar comp; // 0x6A
|
||||
ziU8 nSeg; // 0x6C
|
||||
ziU8 segs1[16][12]; // 0x6D
|
||||
ziU8 segsD[16][12]; // 0x12D
|
||||
ziU8 segs1[0xC0]; // 0x6D
|
||||
ziU8 segsD[0xC0]; // 0x12D
|
||||
ziU8 pad_0x1ED; // 0x1ED
|
||||
} ziMatchParam;
|
||||
|
||||
|
||||
@@ -67,11 +67,12 @@ ziWChar Zi8ConvertUC2WC(ziChar character, ziU8 language ZI_NEED_WORK) {
|
||||
return mapped[character - defaults->first];
|
||||
}
|
||||
ziChar Zi8ConvertWC2UC(ziWChar character, ziU8 language ZI_NEED_WORK) {
|
||||
ziU16 index, count, value, first, last;
|
||||
ziU8* cursor;
|
||||
ziU16 index, count, first, last, value;
|
||||
ziConversionTable* table;
|
||||
const ziConversionRangeTable* defaults;
|
||||
ziConversionRange* ranges;
|
||||
ziConversionEntry* entry;
|
||||
ziU8* cursor;
|
||||
if (character == 0) {
|
||||
Zi8LogError(0x133, __zi8_work_data);
|
||||
return 0;
|
||||
@@ -82,109 +83,94 @@ ziChar Zi8ConvertWC2UC(ziWChar character, ziU8 language ZI_NEED_WORK) {
|
||||
Zi8LogError(0x6AE, __zi8_work_data);
|
||||
return 0;
|
||||
}
|
||||
entry = (ziConversionEntry*)table;
|
||||
count = (ziU16)entry->first[0] << 8 | entry->first[1];
|
||||
entry++;
|
||||
entry = table->entries;
|
||||
count = (ziU16)table->count[0] << 8 | table->count[1];
|
||||
for (index = 0; index < count; index++) {
|
||||
first = (ziU16)entry->first[0] << 8 | entry->first[1];
|
||||
first = ((ziU16)entry->first[0] << 8 | entry->first[1]);
|
||||
last = (ziU16)entry->last[0] << 8 | entry->last[1];
|
||||
if (character < first || character > last) {
|
||||
entry++;
|
||||
continue;
|
||||
}
|
||||
value = (ziU16)entry->value[0] << 8 | entry->value[1];
|
||||
if (first == last) {
|
||||
if (first <= character && character <= last) {
|
||||
value = ((ziU16)entry->value[0] << 8 | entry->value[1]);
|
||||
if (first == last) {
|
||||
Zi8LogError(100, __zi8_work_data);
|
||||
return value & 0xFF;
|
||||
}
|
||||
Zi8LogError(100, __zi8_work_data);
|
||||
return value & 0xFF;
|
||||
return ((ziU8*)table->entries)[character + value - first];
|
||||
}
|
||||
entry = (ziConversionEntry*)((ziU8*)table + value + character - first + 8);
|
||||
Zi8LogError(100, __zi8_work_data);
|
||||
return *(ziU8*)entry;
|
||||
entry++;
|
||||
}
|
||||
Zi8LogError(0x6C2, __zi8_work_data);
|
||||
return 0;
|
||||
} else {
|
||||
ranges = Zi8CvrtTables.reverse.entries;
|
||||
if (ranges == 0) {
|
||||
defaults = &Zi8CvrtTables.reverse;
|
||||
if (defaults == 0) {
|
||||
Zi8LogError(0x6AE, __zi8_work_data);
|
||||
return 0;
|
||||
}
|
||||
count = Zi8CvrtTables.reverse.count;
|
||||
for (index = 0; index < count; index++) {
|
||||
if (character >= ranges[index].first && character <= ranges[index].last) {
|
||||
ranges = defaults->entries;
|
||||
for (index = 0; index < defaults->count; index++) {
|
||||
if (ranges[index].first <= character && character <= ranges[index].last) {
|
||||
Zi8LogError(100, __zi8_work_data);
|
||||
if (ranges[index].first == ranges[index].last)
|
||||
return ranges[index].result.character & 0xFF;
|
||||
cursor = ranges[index].result.table;
|
||||
return cursor[character - ranges[index].first];
|
||||
if (ranges[index].first == ranges[index].last) return ranges[index].result.character & 0xFF;
|
||||
return ((ziU8*)ranges[index].result.table)[character - ranges[index].first];
|
||||
}
|
||||
}
|
||||
Zi8LogError(0x6C2, __zi8_work_data);
|
||||
return 0;
|
||||
}
|
||||
Zi8LogError(0x6C2, __zi8_work_data);
|
||||
return 0;
|
||||
}
|
||||
ziWChar Zi8ConvertUC2Key(ziChar character, ziU8 language ZI_NEED_WORK) {
|
||||
ziU16 key = 0;
|
||||
ziU16 index, count, first, last;
|
||||
ziU16 count, index, first, last;
|
||||
ziU32 key = 0;
|
||||
ziConversionTable* table;
|
||||
ziWChar* mapped;
|
||||
const ziConversionRangeTable* defaults;
|
||||
ziConversionRange* ranges;
|
||||
ziConversionEntry* entry;
|
||||
ziU8* cursor;
|
||||
if (character == 0) {
|
||||
Zi8LogError(0x133, __zi8_work_data);
|
||||
return 0;
|
||||
}
|
||||
if (ZI_WORK->userKeys[language] != 0)
|
||||
return Zi8ConvertUC2UserKey(character, language, __zi8_work_data);
|
||||
if (ZI_WORK->userKeys[language] != 0) return Zi8ConvertUC2UserKey(character, language, __zi8_work_data);
|
||||
if (Zi8GetTableCount(language, 8, __zi8_work_data) != 0) {
|
||||
table = Zi8GetTableAddress(language, 8, __zi8_work_data);
|
||||
if (table == 0) {
|
||||
Zi8LogError(0x6B8, __zi8_work_data);
|
||||
return 0;
|
||||
}
|
||||
entry = (ziConversionEntry*)table;
|
||||
count = (ziU16)entry->first[0] << 8 | entry->first[1];
|
||||
entry++;
|
||||
entry = table->entries;
|
||||
count = (ziU16)table->count[0] << 8 | table->count[1];
|
||||
for (index = 0; index < count; index++) {
|
||||
first = (ziU16)entry->first[0] << 8 | entry->first[1];
|
||||
first = ((ziU16)entry->first[0] << 8 | entry->first[1]);
|
||||
last = (ziU16)entry->last[0] << 8 | entry->last[1];
|
||||
if (character < first || character > last) {
|
||||
entry++;
|
||||
continue;
|
||||
if (first <= character && character <= last) {
|
||||
key = ((ziU16)entry->value[0] << 8 | entry->value[1]);
|
||||
if (first != last) {
|
||||
cursor = (ziU8*)table->entries + key + (character - first) * 2;
|
||||
key = (ziU16)cursor[0] << 8 | cursor[1];
|
||||
}
|
||||
break;
|
||||
}
|
||||
key = (ziU16)entry->value[0] << 8 | entry->value[1];
|
||||
if (first == last) break;
|
||||
entry = (ziConversionEntry*)((ziU8*)table + key + (character - first) * 2);
|
||||
entry = (ziConversionEntry*)((ziU8*)entry + 8);
|
||||
key = (ziU16)entry->first[0] << 8 | entry->first[1];
|
||||
break;
|
||||
entry++;
|
||||
}
|
||||
} else {
|
||||
ranges = Zi8CvrtTables.keys.entries;
|
||||
if (ranges == 0) {
|
||||
defaults = &Zi8CvrtTables.keys;
|
||||
if (defaults == 0) {
|
||||
Zi8LogError(0x6B8, __zi8_work_data);
|
||||
return 0;
|
||||
}
|
||||
count = Zi8CvrtTables.keys.count;
|
||||
for (index = 0; index < count; index++) {
|
||||
if (character >= ranges[index].first && character <= ranges[index].last) {
|
||||
if (ranges[index].first == ranges[index].last) {
|
||||
key = (ziU8)ranges[index].result.character;
|
||||
break;
|
||||
}
|
||||
mapped = ranges[index].result.table;
|
||||
key = mapped[character - ranges[index].first];
|
||||
ranges = defaults->entries;
|
||||
for (index = 0; index < defaults->count; index++) {
|
||||
if (ranges[index].first <= character && character <= ranges[index].last) {
|
||||
if (ranges[index].first == ranges[index].last) key = ranges[index].result.character & 0xFF;
|
||||
else key = ((ziWChar*)ranges[index].result.table)[character - ranges[index].first];
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
if (key == 0) {
|
||||
Zi8LogError(0x6C2, __zi8_work_data);
|
||||
return 0xEFF1;
|
||||
} else {
|
||||
Zi8LogError(100, __zi8_work_data);
|
||||
return key;
|
||||
}
|
||||
key = 0xEFF1;
|
||||
} else Zi8LogError(100, __zi8_work_data);
|
||||
return key;
|
||||
}
|
||||
ziWChar Zi8ConvertWC2Key(ziWChar character, ziU8 language ZI_NEED_WORK) {
|
||||
return Zi8ConvertUC2Key(Zi8ConvertWC2UC(character, language, __zi8_work_data), language, __zi8_work_data);
|
||||
|
||||
@@ -269,10 +269,10 @@ Zi8UInt Zi8SpellingZY(ziU16 *output,Zi8UInt key,ziU8 includeTone)
|
||||
|
||||
Zi8UInt Zi8SpellingPY(ziU16 *output,Zi8UInt key,ziU8 includeTone)
|
||||
{
|
||||
Zi8UInt length = 0;
|
||||
ziU16 initialIndex = (ziU16)(((key & 0xffff) >> 9) & 0x3f);
|
||||
ziU16 finalIndex = (ziU16)(((key & 0xffff) >> 3) & 0x3f);
|
||||
volatile ziU16 tone = (ziU16)(key & 7);
|
||||
ziU16 tone = (ziU16)(key & 7);
|
||||
Zi8UInt length = 0;
|
||||
|
||||
output[0] = zi8PYinitialSpelling[initialIndex][0];
|
||||
output[1] = zi8PYinitialSpelling[initialIndex][1];
|
||||
@@ -311,7 +311,7 @@ Zi8UInt Zi8SpellingPY(ziU16 *output,Zi8UInt key,ziU8 includeTone)
|
||||
return length;
|
||||
}
|
||||
|
||||
ziU8 Zi8IsMatch1Key(ziU16 *input,Zi8UInt inputLength,Zi8UInt key,ziU8 requireFull,ziU8 usePinyin,ziU8 tone)
|
||||
ziU8 Zi8IsMatch1Key(ziU16 *input,Zi8UInt inputLength,Zi8UInt key,ziU8 requireFull,ziU8 usePinyin,Zi8UInt tone)
|
||||
{
|
||||
ziU16 spelling[16];
|
||||
Zi8UInt spellingLength;
|
||||
@@ -330,7 +330,7 @@ ziU8 Zi8IsMatch1Key(ziU16 *input,Zi8UInt inputLength,Zi8UInt key,ziU8 requireFul
|
||||
if ((requireFull != 0) && ((inputLength & 0xff) != (spellingLength & 0xff))) {
|
||||
return 0;
|
||||
}
|
||||
if ((tone == 0) && ((inputLength & 0xff) > (spellingLength & 0xff))) {
|
||||
if (((tone & 0xff) == 0) && ((inputLength & 0xff) > (spellingLength & 0xff))) {
|
||||
switch (input[(inputLength & 0xff) - 1]) {
|
||||
case 0xeff1:
|
||||
case 0xeff2:
|
||||
@@ -943,7 +943,8 @@ Zi8UInt Zi8Get1KeyPressSpelling(Zi8OneKeyParam *params,Zi8OneKeyOptions *options
|
||||
*output |= 0xf300;
|
||||
output++;
|
||||
} else {
|
||||
*output++ = 0xf360;
|
||||
*output = 0xf360;
|
||||
output++;
|
||||
}
|
||||
}
|
||||
tableIndex++;
|
||||
|
||||
@@ -305,7 +305,7 @@ ziU8 Zi8LangSupported(ziU8 language, ziPtr work);
|
||||
ziU8 Zi8MatchOEMdata(ziWChar* elements, ziU8 count, ziU8 language, ziWChar* word, ziU16 capacity, ziU8 mode, ziU8 status, ziPtr work);
|
||||
ziU8 Zi8MatchPUDdata(ziWChar* elements, ziU8 count, ziU8 language, ziWChar* word, ziU16 capacity, ziU8 mode, ziU8 status, ziPtr work);
|
||||
ziU8 Zi8MatchROMdata(ziWChar* elements, ziU8 count, ziU8 language, ziWChar* word, ziU16 capacity, ziU8 mode, ziU8 status, ziBool reservedMode, ziBool exactLength, ziPtr work);
|
||||
ziU8 Zi8MatchUWDdata(ziWChar* elements, ziU8 count, ziWChar* currentWord, ziU16 currentLength, ziU8 language, ziWChar* word, ziU16 capacity, ziU8 mode, ziU8 status, ziPtr work);
|
||||
ziU8 Zi8MatchUWDdata(ziWChar* elements, ziU8 count, ziWChar* currentWord, ziU8 currentLength, ziU8 language, ziWChar* word, ziU16 capacity, ziU8 mode, ziU8 status, ziPtr work);
|
||||
void Zi8Memset(ziPtr destination, ziU32 value, ziU32 count);
|
||||
ziU16 Zi8WCharCount(ziWChar* word, ziPtr work);
|
||||
ziBool Zi8ZHCheckSpelling(ziWChar* word, ziWChar* elements, ziU8 count, ziPtr work);
|
||||
@@ -414,12 +414,7 @@ int Zi8AlphaGetCandidates(ziGetParam* parameters, ziPtr optionData, ziPtr workDa
|
||||
phoneticInput = ZI8_TRUE;
|
||||
for (elementIndex = 0; elementIndex < elementCount; elementIndex++) {
|
||||
normalizedElements[elementIndex] = elements[elementIndex];
|
||||
switch ((int)elements[elementIndex]) {
|
||||
case 0xf331:
|
||||
case 0xf332:
|
||||
case 0xf333:
|
||||
case 0xf334:
|
||||
case 0xf335:
|
||||
if ((int)elements[elementIndex] < 0xf336 && (int)elements[elementIndex] >= 0xf331) {
|
||||
phoneticSeparator = ZI8_TRUE;
|
||||
phoneticInput = ZI8_FALSE;
|
||||
if ((language == 0x7d) || ((language == 0x79 || (language == 0x7a)))) {
|
||||
@@ -892,7 +887,7 @@ selectDictionary:
|
||||
if ((((matchMode == 0) && (currentVowelRestriction)) &&
|
||||
((2 < (int)elementCount &&
|
||||
((((ZiAlphaWork*)workData)->language == language &&
|
||||
(((ZiAlphaWork*)workData)->prefixCount == elementCount - 1)))))) &&
|
||||
((unsigned int)((ZiAlphaWork*)workData)->prefixCount == elementCount - 1)))))) &&
|
||||
(elements[elementCount - 1] == 0xeff1)) {
|
||||
wordLength = 0;
|
||||
}
|
||||
@@ -947,15 +942,15 @@ selectDictionary:
|
||||
}
|
||||
if (wordLength != 0) goto filterVowelCandidate;
|
||||
dictionaryStatus[dictionaryKind] = 1;
|
||||
if (elements[apostropheIndex] >= 0xEFF1) goto retryDictionary;
|
||||
goto finishDictionaryPass;
|
||||
if (elements[apostropheIndex] < 0xEFF1) goto finishDictionaryPass;
|
||||
goto retryDictionary;
|
||||
}
|
||||
filterVowelCandidate:
|
||||
if ((wordLength != 0) && (prefixVowelRestriction)) {
|
||||
if ((*wordCursor >= 0x30) && (*wordCursor <= 0x39)) {
|
||||
wordLength = 0;
|
||||
} else {
|
||||
if (((elementCount == 1) && (dictionaryKind != 10)) && (*wordCursor >= 0xeff1)) {
|
||||
if (((elementCount == 1) && (dictionaryKind != 10)) && (0xeff0 < *wordCursor)) {
|
||||
punctuationCandidate = ZI8_TRUE;
|
||||
goto finishDictionaryPass;
|
||||
}
|
||||
@@ -1022,59 +1017,67 @@ filterVowelCandidate:
|
||||
}
|
||||
break;
|
||||
case 10:
|
||||
if ((*wordCursor = *punctuationCursor) != 0) {
|
||||
punctuationCursor++;
|
||||
index = *punctuationCursor;
|
||||
*wordCursor = index;
|
||||
if (index == 0) {
|
||||
wordLength = 0;
|
||||
}
|
||||
else {
|
||||
punctuationCursor = punctuationCursor + 1;
|
||||
wordLength = 1;
|
||||
} else {
|
||||
wordLength = 0;
|
||||
}
|
||||
break;
|
||||
case 11:
|
||||
if (prefixCount != 0) break;
|
||||
if (retryPunctuation) {
|
||||
for (index = 0; index < parameters->elementCount - 1; index++) {
|
||||
wordCursor[index] = ((ZiAlphaWork*)workData)->prefix[index];
|
||||
if (wordCursor[index] == 0) break;
|
||||
case 0xb:
|
||||
if (prefixCount == 0) {
|
||||
if (retryPunctuation) {
|
||||
for (index = 0;
|
||||
index < parameters->elementCount - 1; index++) {
|
||||
wordCursor[index] = ((ZiAlphaWork*)workData)->prefix[index];
|
||||
if (wordCursor[index] == 0) break;
|
||||
}
|
||||
if (index < (int)(parameters->elementCount - 1)) {
|
||||
wordLength = 0;
|
||||
}
|
||||
else {
|
||||
appendPunctuation:
|
||||
wordLength = index + 1;
|
||||
wordCursor[index] = *punctuationCursor;
|
||||
if (wordCursor[index] == 0) {
|
||||
wordLength = 0;
|
||||
}
|
||||
else {
|
||||
punctuationCursor = punctuationCursor + 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
if (index < parameters->elementCount - 1) {
|
||||
else {
|
||||
for (index = 0;
|
||||
index < ((ZiAlphaWork*)workData)->rememberedCount; index++) {
|
||||
wordCursor[index] = ((ZiAlphaWork*)workData)->rememberedWord[index];
|
||||
if (wordCursor[index] == 0) break;
|
||||
}
|
||||
if ((int)(unsigned int)((ZiAlphaWork*)workData)->rememberedCount <= index) goto appendPunctuation;
|
||||
wordLength = 0;
|
||||
break;
|
||||
}
|
||||
} else {
|
||||
for (index = 0; index < ((ZiAlphaWork*)workData)->rememberedCount; index++) {
|
||||
wordCursor[index] = ((ZiAlphaWork*)workData)->rememberedWord[index];
|
||||
if (wordCursor[index] == 0) break;
|
||||
}
|
||||
if (index < ((ZiAlphaWork*)workData)->rememberedCount) {
|
||||
wordLength = 0;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if ((wordCursor[index++] = *punctuationCursor) != 0) {
|
||||
punctuationCursor++;
|
||||
wordLength = index;
|
||||
} else {
|
||||
wordLength = 0;
|
||||
}
|
||||
break;
|
||||
}
|
||||
dictionaryStatus[dictionaryKind] = 1;
|
||||
if (wordLength == 0) {
|
||||
dictionaryStatus[dictionaryKind] = 2;
|
||||
if ((((((((ZiAlphaWork*)workData)->prefixEnabled != '\0') && (!retryPunctuation)) && (parameters->elementCount != 0)) &&
|
||||
((((ZiAlphaWork*)workData)->requiredLength >= parameters->elementCount - 1 &&
|
||||
(((int)(parameters->elementCount - 1) <= (int)(unsigned int)((ZiAlphaWork*)workData)->requiredLength &&
|
||||
(parameters->elements[parameters->elementCount - 1] == 0xEFF1)))) &&
|
||||
(((((ZiAlphaWork*)workData)->prefixEnabled != '\x01' ||
|
||||
(((ZiAlphaWork*)workData)->requiredLength != parameters->elementCount)) &&
|
||||
(((((ZiAlphaWork*)workData)->prefixLength == '\0' ||
|
||||
(((ZiAlphaWork*)workData)->prefixLength + 1 >= parameters->elementCount)) && (dictionaryExact != 0)))
|
||||
((unsigned int)parameters->elementCount <= ((ZiAlphaWork*)workData)->prefixLength + 1)) && (dictionaryExact != 0)))
|
||||
))) && ((((completionAllowed && (prefixCount == 0)) && (dictionaryKind != 0xb)) &&
|
||||
((((int)dictionaryIndex < (int)(unsigned int)((ZiAlphaWork*)workData)->dictionaryCount &&
|
||||
(((ZiAlphaOptions*)optionData)->lookupMode == '\0')) &&
|
||||
(((ZiAlphaWork*)workData)->dictionaries[language] == 0)))))) {
|
||||
if (language != ((ZiAlphaWork*)workData)->language) break;
|
||||
index = ((ZiAlphaWork*)workData)->dictionaryKinds[dictionaryIndex + 1];
|
||||
if (index == 0xc || (index < 9 && index >= 5)) {
|
||||
if ((index == 0xc) || (((index < 0xc && (index < 9)) && (4 < index)))) {
|
||||
if (Zi8getKeyLayout(language,0xeff1,&punctuationBuffer[0],1,workData) == 0) {
|
||||
punctuationBuffer[0] = 0;
|
||||
}
|
||||
@@ -1086,10 +1089,10 @@ filterVowelCandidate:
|
||||
}
|
||||
if ((((((dictionaryExact == 0) || (!completionAllowed)) || (prefixCount != 0)) ||
|
||||
((dictionaryKind == 0xb ||
|
||||
(dictionaryIndex >= ((ZiAlphaWork*)workData)->dictionaryCount)))) ||
|
||||
(elements == 0)) ||
|
||||
((int)(unsigned int)((ZiAlphaWork*)workData)->dictionaryCount <= (int)dictionaryIndex)))) ||
|
||||
(elements == (ziU16 *)0x0)) ||
|
||||
((((elementCount == 0 || (elements[elementCount - 1] != 0xeff1)) ||
|
||||
((((ZiAlphaWork*)workData)->rememberedCount != parameters->elementCount - 1 ||
|
||||
(((unsigned int)((ZiAlphaWork*)workData)->rememberedCount != parameters->elementCount - 1 ||
|
||||
(((((ZiAlphaWork*)workData)->rememberedWord[0] == 0 || (((ZiAlphaOptions*)optionData)->lookupMode != '\0')) ||
|
||||
(((ZiAlphaWork*)workData)->dictionaries[language] != 0)))))) ||
|
||||
(languagePassCount == 2)))) break;
|
||||
@@ -1101,7 +1104,7 @@ filterVowelCandidate:
|
||||
punctuationCursor = &punctuationBuffer[0];
|
||||
dictionaryKind = 0xb;
|
||||
}
|
||||
else if (((ZiAlphaOptions*)optionData)->minWordLength <= wordLength) {
|
||||
else if ((int)(unsigned int)(ziU8)((ZiAlphaOptions*)optionData)->minWordLength <= (int)wordLength) {
|
||||
if (prefixVowelRestriction) {
|
||||
if (*wordCursor >= 0x30 && *wordCursor <= 0x39) goto retryDictionary;
|
||||
if (language == 0x2f) {
|
||||
@@ -1116,15 +1119,15 @@ filterVowelCandidate:
|
||||
{
|
||||
prepareCandidate:
|
||||
if (((elementCount == 1) && (dictionaryKind != 10)) &&
|
||||
((*wordCursor >= 0xeff1 && *wordCursor <= 0xf010))) {
|
||||
((0xeff0 < *wordCursor && (*wordCursor < 0xf011)))) {
|
||||
punctuationCandidate = ZI8_TRUE;
|
||||
break;
|
||||
}
|
||||
wordCursor[wordLength] = 0;
|
||||
if (((exactLengthOnly != 0) && (elementCount != 0)) && ((int)wordLength > (int)elementCount))
|
||||
if (((exactLengthOnly != 0) && (elementCount != 0)) && ((int)elementCount < (int)wordLength))
|
||||
{
|
||||
wordLength = elementCount;
|
||||
wordCursor[wordLength] = 0;
|
||||
wordCursor[elementCount] = 0;
|
||||
}
|
||||
wordLength = (ziU16)Zi8DeTokenization(wordCursor,wordLength & 0xffff,wordCapacity & 0xffff,language);
|
||||
if (((phoneticInput) && ((unsigned int)parameters->elementCount < (wordLength & 0xff))) &&
|
||||
@@ -1136,39 +1139,35 @@ prepareCandidate:
|
||||
((Zi8ZHCheckSpelling(wordCursor,parameters->elements,parameters->elementCount,
|
||||
workData)) != '\0')) {
|
||||
if ((((ZiAlphaWork*)workData)->caseMode != '\0') && ((!phoneticInput && (!phoneticSeparator)))) {
|
||||
Zi8ChangeWordCase(wordCursor - prefixCount,language,workData);
|
||||
Zi8ChangeWordCase(wordCursor + -prefixCount,language,workData);
|
||||
}
|
||||
if ((((ZiAlphaOptions*)optionData)->suffixOnly != '\0') &&
|
||||
((int)((ZiAlphaOptions*)optionData)->maxWordLength < (int)(wordLength + prefixCount))) {
|
||||
wordLength = ((ZiAlphaOptions*)optionData)->maxWordLength - prefixCount;
|
||||
((int)(unsigned int)(ziU8)((ZiAlphaOptions*)optionData)->maxWordLength < (int)(wordLength + prefixCount))) {
|
||||
wordLength = (ziU8)((ZiAlphaOptions*)optionData)->maxWordLength - prefixCount;
|
||||
wordCursor[wordLength] = 0;
|
||||
}
|
||||
if (((int)((ZiAlphaOptions*)optionData)->maxWordLength < (int)(wordLength + prefixCount)) ||
|
||||
((Zi8IsDupWordW(wordCursor - prefixCount,wordLength + prefixCount & 0xff,
|
||||
if (((int)(unsigned int)(ziU8)((ZiAlphaOptions*)optionData)->maxWordLength < (int)(wordLength + prefixCount)) ||
|
||||
((Zi8IsDupWordW(wordCursor + -prefixCount,wordLength + prefixCount & 0xff,
|
||||
workData)) != '\0')) {
|
||||
if ((prefixCount != 0) && (((ZiAlphaOptions*)optionData)->maxWordLength <= prefixCount)) break;
|
||||
if ((prefixCount != 0) && ((ziU8)((ZiAlphaOptions*)optionData)->maxWordLength <= prefixCount)) break;
|
||||
}
|
||||
else {
|
||||
|
||||
if ((((keyLayoutCount == 0) || (((ZiAlphaOptions*)optionData)->lookupMode != '\0')) ||
|
||||
((int)(wordLength + prefixCount) <= 1)) ||
|
||||
((int)(wordLength + prefixCount) < 2)) ||
|
||||
(0x40 < (int)(wordLength + prefixCount))) goto emitCandidate;
|
||||
switch (dictionaryKind) {
|
||||
case 5:
|
||||
case 1:
|
||||
case 9:
|
||||
if (dictionaryKind == 5) {
|
||||
checkKeyLayout:
|
||||
keyLayoutCursor = keyLayout;
|
||||
candidateCharacterCount = wordLength + prefixCount;
|
||||
for (index = 0; (int)index < (int)(unsigned int)keyLayoutCount; index = index + 1) {
|
||||
if (*keyLayoutCursor < candidateCharacterCount) {
|
||||
keyLayoutCursor = keyLayoutCursor + *keyLayoutCursor + 1;
|
||||
} else {
|
||||
if (*keyLayoutCursor++ > candidateCharacterCount) {
|
||||
if (candidateCharacterCount <= *keyLayoutCursor) {
|
||||
if (candidateCharacterCount < *keyLayoutCursor++) {
|
||||
index = (unsigned int)keyLayoutCount;
|
||||
}
|
||||
break;
|
||||
}
|
||||
keyLayoutCursor = keyLayoutCursor + *keyLayoutCursor + 1;
|
||||
}
|
||||
if ((int)index < (int)(unsigned int)keyLayoutCount) {
|
||||
for (elementIndex = 0; (int)elementIndex < (int)(unsigned int)candidateCharacterCount;
|
||||
@@ -1176,31 +1175,32 @@ checkKeyLayout:
|
||||
candidateBytes[elementIndex] = Zi8ConvertWC2UC(wordCursor[elementIndex - prefixCount],language,workData);
|
||||
}
|
||||
for (; (int)index < (int)(unsigned int)keyLayoutCount; index = index + 1) {
|
||||
elementIndex = 0;
|
||||
while (elementIndex < candidateCharacterCount) {
|
||||
if (candidateBytes[elementIndex] != keyLayoutCursor[elementIndex]) break;
|
||||
elementIndex++;
|
||||
for (elementIndex = 0;
|
||||
((int)elementIndex < (int)(unsigned int)candidateCharacterCount &&
|
||||
(candidateBytes[elementIndex] == keyLayoutCursor[elementIndex]));
|
||||
elementIndex = elementIndex + 1) {
|
||||
}
|
||||
if (elementIndex == candidateCharacterCount) {
|
||||
wordCursor[-prefixCount] = 0;
|
||||
goto retryDictionary;
|
||||
}
|
||||
keyLayoutCursor += candidateCharacterCount;
|
||||
if (*keyLayoutCursor++ > candidateCharacterCount) break;
|
||||
if (candidateCharacterCount < *keyLayoutCursor++) break;
|
||||
}
|
||||
}
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
else if (dictionaryKind < 5) {
|
||||
if (dictionaryKind == 1) goto checkKeyLayout;
|
||||
}
|
||||
else if (dictionaryKind == 9) goto checkKeyLayout;
|
||||
emitCandidate:
|
||||
if (firstCandidate == 0) {
|
||||
if (((ZiAlphaOptions*)optionData)->countOnly != '\0') {
|
||||
if (((ZiAlphaOptions*)optionData)->suffixOnly != '\0') {
|
||||
if ((int)((ZiAlphaOptions*)optionData)->shortestWord > (int)(wordLength + prefixCount)) {
|
||||
if ((int)(wordLength + prefixCount) < (int)(unsigned int)(ziU8)((ZiAlphaOptions*)optionData)->shortestWord) {
|
||||
((ZiAlphaOptions*)optionData)->shortestWord = wordLength + prefixCount;
|
||||
}
|
||||
if ((int)((ZiAlphaOptions*)optionData)->longestWord < (int)(wordLength + prefixCount)) {
|
||||
if ((int)(unsigned int)(ziU8)((ZiAlphaOptions*)optionData)->longestWord < (int)(wordLength + prefixCount)) {
|
||||
((ZiAlphaOptions*)optionData)->longestWord = wordLength + prefixCount;
|
||||
}
|
||||
}
|
||||
@@ -1224,17 +1224,23 @@ emitCandidate:
|
||||
} else {
|
||||
if (((((ZiAlphaWork*)workData)->suffixMode == '\0') && (wordCursor[1] == 0)) &&
|
||||
(candidateCount == 0)) {
|
||||
if (*wordCursor >= 0xeff1 && *wordCursor <= 0xf010) {
|
||||
((ZiAlphaWork*)workData)->singleCharacter = 0;
|
||||
}
|
||||
else {
|
||||
if ((*wordCursor < 0xeff1) || (0xf010 < *wordCursor)) {
|
||||
((ZiAlphaWork*)workData)->singleCharacter = *wordCursor;
|
||||
}
|
||||
else {
|
||||
((ZiAlphaWork*)workData)->singleCharacter = 0;
|
||||
}
|
||||
}
|
||||
if (dictionaryExact != 0 &&
|
||||
parameters->elementCount == ((ZiAlphaWork*)workData)->rememberedCount &&
|
||||
(parameters->maxCandidates == 1 ||
|
||||
(candidateCount == 0 && parameters->firstCandidate == 0))) {
|
||||
if (((dictionaryExact == 0) || (parameters->elementCount != ((ZiAlphaWork*)workData)->rememberedCount))
|
||||
|| ((parameters->maxCandidates != 1 &&
|
||||
((candidateCount != 0 || (parameters->firstCandidate != 0)))))) {
|
||||
if (((dictionaryExact == 0) && (parameters->elementCount == ((ZiAlphaWork*)workData)->rememberedCount))
|
||||
&& ((parameters->maxCandidates == 1 ||
|
||||
((candidateCount == 0 && (parameters->firstCandidate == 0)))))) {
|
||||
((ZiAlphaWork*)workData)->rememberedWord[0] = 0;
|
||||
}
|
||||
}
|
||||
else {
|
||||
for (index = 0; (int)index < (int)prefixCount; index = index + 1) {
|
||||
((ZiAlphaWork*)workData)->rememberedWord[index]
|
||||
= wordCursor[index - prefixCount];
|
||||
@@ -1245,13 +1251,6 @@ emitCandidate:
|
||||
}
|
||||
((ZiAlphaWork*)workData)->rememberedWord[index + prefixCount] = 0;
|
||||
}
|
||||
else {
|
||||
if (((dictionaryExact == 0) && (parameters->elementCount == ((ZiAlphaWork*)workData)->rememberedCount))
|
||||
&& ((parameters->maxCandidates == 1 ||
|
||||
((candidateCount == 0 && (parameters->firstCandidate == 0)))))) {
|
||||
((ZiAlphaWork*)workData)->rememberedWord[0] = 0;
|
||||
}
|
||||
}
|
||||
if ((((ZiAlphaWork*)workData)->suffixMode == '\0') &&
|
||||
((((((dictionaryKind == 1 && ((((ZiAlphaWork*)workData)->dictionaryFlags & 1) != 0)) ||
|
||||
((dictionaryKind == 3 && ((((ZiAlphaWork*)workData)->dictionaryFlags & 2) != 0)))) ||
|
||||
@@ -1314,7 +1313,7 @@ emitCandidate:
|
||||
}
|
||||
else {
|
||||
if (((ZiAlphaOptions*)optionData)->suffixOnly != '\0') {
|
||||
wordCursor = wordCursor - prefixCount;
|
||||
wordCursor = wordCursor + -prefixCount;
|
||||
wordCapacity = wordCapacity + prefixCount;
|
||||
wordLength += prefixCount;
|
||||
for (index = 0; parameters->elementCount + index < wordLength; index++) {
|
||||
@@ -1436,7 +1435,7 @@ finishDictionaryPass:;
|
||||
if ((completionAllowed) &&
|
||||
((((((ZiAlphaWork*)workData)->suffixMode == '\0' && (2 < (int)elementCount)) &&
|
||||
(elements[elementCount - 2] == 0xeff1)) &&
|
||||
((int)((ZiAlphaWork*)workData)->prefixCount == elementCount - 2)))) {
|
||||
((unsigned int)((ZiAlphaWork*)workData)->prefixCount == elementCount - 2)))) {
|
||||
((ZiAlphaWork*)workData)->prefixElementCount = ((ZiAlphaWork*)workData)->prefixCount + '\x01';
|
||||
((ZiAlphaWork*)workData)->suffixMode = 1;
|
||||
}
|
||||
@@ -1444,58 +1443,19 @@ finishDictionaryPass:;
|
||||
prefixPrepared = ZI8_TRUE;
|
||||
goto preparePrefix;
|
||||
}
|
||||
if (!((((completionAllowed) && (((ZiAlphaWork*)workData)->suffixMode != '\0')) &&
|
||||
if ((((completionAllowed) && (((ZiAlphaWork*)workData)->suffixMode != '\0')) &&
|
||||
((((ZiAlphaWork*)workData)->suffixLocked == '\0' && (2 < (int)elementCount)))) &&
|
||||
(((elements[elementCount - 2] == 0xeff1 &&
|
||||
((int)((ZiAlphaWork*)workData)->suffixCount == elementCount - 2)) ||
|
||||
(((int)((ZiAlphaWork*)workData)->suffixCount == elementCount - 1 &&
|
||||
((Zi8IsAlphaPunct(elements[elementCount - 1])) != '\0'))))))) {
|
||||
tryAlternatePrefix:
|
||||
if ((prefixPrepared) && (1 < ((ZiAlphaWork*)workData)->alternatePrefixCount)) {
|
||||
if (language == parameters->language) {
|
||||
if (primaryMatched) {
|
||||
((ZiAlphaWork*)workData)->alternatePrefixCount = 0;
|
||||
}
|
||||
}
|
||||
else if (secondaryMatched) {
|
||||
((ZiAlphaWork*)workData)->alternatePrefixCount = 0;
|
||||
}
|
||||
if (((ZiAlphaWork*)workData)->alternatePrefixCount != '\0') {
|
||||
wordCursor -= prefixCount;
|
||||
elements -= prefixCount;
|
||||
elementCount = elementCount + prefixCount;
|
||||
wordCapacity = wordCapacity + prefixCount;
|
||||
prefixCount = 0;
|
||||
prefixPrepared = ZI8_FALSE;
|
||||
((ZiAlphaWork*)workData)->suffixMode = 0;
|
||||
((ZiAlphaWork*)workData)->suffixLocked = 0;
|
||||
((ZiAlphaWork*)workData)->suffixCount = 0;
|
||||
for (index = 0; index < (int)(unsigned int)((ZiAlphaWork*)workData)->alternatePrefixCount; index = index + 1) {
|
||||
((ZiAlphaWork*)workData)->prefix[index] =
|
||||
((ZiAlphaWork*)workData)->alternatePrefix[index];
|
||||
}
|
||||
((ZiAlphaWork*)workData)->prefixCount = (ziU8)index;
|
||||
if (((ZiAlphaWork*)workData)->language == parameters->language) {
|
||||
((ZiAlphaWork*)workData)->language = parameters->subLanguage;
|
||||
}
|
||||
else {
|
||||
((ZiAlphaWork*)workData)->language = parameters->language;
|
||||
}
|
||||
((ZiAlphaWork*)workData)->alternatePrefixCount = 0;
|
||||
}
|
||||
}
|
||||
if ((((primaryMatched) && (secondaryMatched)) || (elementCount == 0)) ||
|
||||
(((language == parameters->language && (primaryMatched)) || ((language == parameters->subLanguage && (secondaryMatched))))))
|
||||
goto finishCandidates;
|
||||
if (completionAllowed) goto checkPrefixPunctuation;
|
||||
} else {
|
||||
((unsigned int)((ZiAlphaWork*)workData)->suffixCount == elementCount - 2)) ||
|
||||
(((unsigned int)((ZiAlphaWork*)workData)->suffixCount == elementCount - 1 &&
|
||||
((Zi8IsAlphaPunct(elements[elementCount - 1])) != '\0')))))) {
|
||||
if ((((ZiAlphaWork*)workData)->prefixEnabled == '\0') || (elements[elementCount - 1] != 0xeff1)) {
|
||||
if ((!primaryMatched) && (!secondaryMatched)) {
|
||||
((ZiAlphaWork*)workData)->suffixLocked = 1;
|
||||
((ZiAlphaWork*)workData)->suffixElementCount = parameters->elementCount - 1;
|
||||
if (prefixCount != 0) {
|
||||
wordCursor -= prefixCount;
|
||||
elements -= prefixCount;
|
||||
wordCursor = wordCursor + -prefixCount;
|
||||
elements = elements + -prefixCount;
|
||||
elementCount = elementCount + prefixCount;
|
||||
wordCapacity = wordCapacity + prefixCount;
|
||||
prefixCount = 0;
|
||||
@@ -1520,8 +1480,8 @@ checkPrefixPunctuation:
|
||||
((((Zi8GetTableCount(language,0x1f,workData)) & 8) == 0 &&
|
||||
(parameters->elements[parameters->elementCount - 1] != 0xEFF1)))))) {
|
||||
if (prefixPrepared) {
|
||||
wordCursor -= prefixCount;
|
||||
elements -= prefixCount;
|
||||
wordCursor = wordCursor + -prefixCount;
|
||||
elements = elements + -prefixCount;
|
||||
elementCount = elementCount + prefixCount;
|
||||
wordCapacity = wordCapacity + prefixCount;
|
||||
prefixCount = 0;
|
||||
@@ -1529,7 +1489,7 @@ checkPrefixPunctuation:
|
||||
if (((ZiAlphaWork*)workData)->suffixLocked != '\0') {
|
||||
((ZiAlphaWork*)workData)->previousSuffixCount = ((ZiAlphaWork*)workData)->suffixElementCount;
|
||||
((ZiAlphaWork*)workData)->suffixElementCount = parameters->elementCount;
|
||||
elementIndex = (int)((ZiAlphaWork*)workData)->prefixCount + (int)((ZiAlphaWork*)workData)->suffixCount;
|
||||
elementIndex = (unsigned int)((ZiAlphaWork*)workData)->prefixCount + (unsigned int)((ZiAlphaWork*)workData)->suffixCount;
|
||||
if (elements[elementIndex] != 0xEFF1 && Zi8IsAlphaPunct(elements[elementIndex]) != 0) {
|
||||
((ZiAlphaWork*)workData)->suffix[((ZiAlphaWork*)workData)->suffixCount++] = elements[elementIndex];
|
||||
} else {
|
||||
@@ -1559,6 +1519,46 @@ checkPrefixPunctuation:
|
||||
goto preparePrefix;
|
||||
}
|
||||
}
|
||||
else {
|
||||
tryAlternatePrefix:
|
||||
if ((prefixPrepared) && (1 < ((ZiAlphaWork*)workData)->alternatePrefixCount)) {
|
||||
if (language == parameters->language) {
|
||||
if (primaryMatched) {
|
||||
((ZiAlphaWork*)workData)->alternatePrefixCount = 0;
|
||||
}
|
||||
}
|
||||
else if (secondaryMatched) {
|
||||
((ZiAlphaWork*)workData)->alternatePrefixCount = 0;
|
||||
}
|
||||
if (((ZiAlphaWork*)workData)->alternatePrefixCount != '\0') {
|
||||
wordCursor = wordCursor + -prefixCount;
|
||||
elements = elements + -prefixCount;
|
||||
elementCount = elementCount + prefixCount;
|
||||
wordCapacity = wordCapacity + prefixCount;
|
||||
prefixCount = 0;
|
||||
prefixPrepared = ZI8_FALSE;
|
||||
((ZiAlphaWork*)workData)->suffixMode = 0;
|
||||
((ZiAlphaWork*)workData)->suffixLocked = 0;
|
||||
((ZiAlphaWork*)workData)->suffixCount = 0;
|
||||
for (index = 0; index < (int)(unsigned int)((ZiAlphaWork*)workData)->alternatePrefixCount; index = index + 1) {
|
||||
((ZiAlphaWork*)workData)->prefix[index] =
|
||||
((ZiAlphaWork*)workData)->alternatePrefix[index];
|
||||
}
|
||||
((ZiAlphaWork*)workData)->prefixCount = (ziU8)index;
|
||||
if (((ZiAlphaWork*)workData)->language == parameters->language) {
|
||||
((ZiAlphaWork*)workData)->language = parameters->subLanguage;
|
||||
}
|
||||
else {
|
||||
((ZiAlphaWork*)workData)->language = parameters->language;
|
||||
}
|
||||
((ZiAlphaWork*)workData)->alternatePrefixCount = 0;
|
||||
}
|
||||
}
|
||||
if ((((primaryMatched) && (secondaryMatched)) || (elementCount == 0)) ||
|
||||
(((language == parameters->language && (primaryMatched)) || ((language == parameters->subLanguage && (secondaryMatched))))))
|
||||
goto finishCandidates;
|
||||
if (completionAllowed) goto checkPrefixPunctuation;
|
||||
}
|
||||
if (!completionAllowed && ((ZiAlphaWork*)workData)->suffixMode == 0 && ((ZiAlphaWork*)workData)->prefixCount != 0 &&
|
||||
elementCount > 2 && ((ZiAlphaWork*)workData)->prefixCount == elementCount - 1 &&
|
||||
Zi8IsAlphaPunct(parameters->elements[((ZiAlphaWork*)workData)->prefixCount - 1]) != 0) goto checkPrefixFields;
|
||||
@@ -1618,7 +1618,7 @@ finishCandidates:
|
||||
} else {
|
||||
wordCursor = 0;
|
||||
}
|
||||
if (wordCursor) {
|
||||
if (wordCursor != (ziU16 *)0x0) {
|
||||
Zi8SetHighlightedWordW(wordCursor,parameters->language,parameters->subLanguage,workData);
|
||||
}
|
||||
}
|
||||
@@ -1634,7 +1634,8 @@ finishCandidates:
|
||||
countIndex = ((ZiAlphaWork*)workData)->dictionaryCount - 1;
|
||||
}
|
||||
for (; countIndex >= 1; countIndex = countIndex - 1) {
|
||||
((ZiAlphaWork*)workData)->dictionaryCounts[countIndex] -=
|
||||
((ZiAlphaWork*)workData)->dictionaryCounts[countIndex] =
|
||||
((ZiAlphaWork*)workData)->dictionaryCounts[countIndex] -
|
||||
((ZiAlphaWork*)workData)->dictionaryCounts[countIndex - 1];
|
||||
}
|
||||
}
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -643,7 +643,7 @@ ziU32 Zi8GetSInfo(ziU8* strokes, ziU8* extraStrokes, ziWChar* outputBuffer, ziU8
|
||||
{
|
||||
int strokeIndex;
|
||||
int outputCount;
|
||||
volatile int extraCount;
|
||||
int extraCount;
|
||||
|
||||
outputCount = 0;
|
||||
Zi8LogError(100, work);
|
||||
@@ -660,7 +660,8 @@ ziU32 Zi8GetSInfo(ziU8* strokes, ziU8* extraStrokes, ziWChar* outputBuffer, ziU8
|
||||
goto lowStroke;
|
||||
}
|
||||
badStroke:
|
||||
outputBuffer[(ziU8)--outputCount] = 0;
|
||||
outputCount--;
|
||||
outputBuffer[(ziU8)outputCount] = 0;
|
||||
return outputCount;
|
||||
lowStroke:
|
||||
outputBuffer[(ziU8)outputCount] = zi8StrokeCode(strokes[strokeIndex] & 0xf, work);
|
||||
|
||||
@@ -89,12 +89,7 @@ ziU32 Zi8MatchPUDdata_ZHS(ziWChar* pattern, ziU8 length, ziU8 language, ziWChar*
|
||||
ZI_WORK->unk_0x310 = (ziU32)table + section->offset[0] * 0x100 + section->offset[1];
|
||||
ZI_WORK->unk_0x318 = 0;
|
||||
}
|
||||
for (;;) {
|
||||
entry = (ziU8*)ZI_WORK->unk_0x310;
|
||||
if (entry == 0) {
|
||||
Zi8LogError(0x4B3, __zi8_work_data);
|
||||
return 0;
|
||||
}
|
||||
while ((entry = (ziU8*)ZI_WORK->unk_0x310) != 0) {
|
||||
while ((ziS32)ZI_WORK->unk_0x318 < (ziS32)ZI_WORK->unk_0x314) {
|
||||
word = entry + 1;
|
||||
wordSize = *entry;
|
||||
@@ -163,6 +158,8 @@ next:
|
||||
fallback = 1;
|
||||
ZI_WORK->unk_0x318 = 0;
|
||||
}
|
||||
Zi8LogError(0x4B3, __zi8_work_data);
|
||||
return 0;
|
||||
}
|
||||
ziU32 Zi8MatchPUDdata(ziWChar* pattern, ziU8 length, ziU8 language, ziWChar* output, ziU16 capacity, ziU8 complete, ziU8 continuation ZI_NEED_WORK) {
|
||||
ziU32 result;
|
||||
@@ -170,12 +167,11 @@ ziU32 Zi8MatchPUDdata(ziWChar* pattern, ziU8 length, ziU8 language, ziWChar* out
|
||||
for (;;) {
|
||||
result = Zi8_8147FD7C(pattern, length, language, output, capacity, complete, continuation, __zi8_work_data);
|
||||
if ((ziU8)result != 0) break;
|
||||
if (++ZI_WORK->pudCount <= 16) {
|
||||
continuation = 0;
|
||||
} else {
|
||||
if ((ZI_WORK->pudCount = ZI_WORK->pudCount + 1) > 16) {
|
||||
ZI_WORK->pudCount = 1;
|
||||
break;
|
||||
}
|
||||
continuation = 0;
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
@@ -45,7 +45,7 @@ ziBool Zi8_81480224(ziUserWord* word ZI_NEED_WORK) {
|
||||
if (candidate->length == length) {
|
||||
position = 0;
|
||||
while (position < length) {
|
||||
if (candidate->text[position] != word->text[position]) break;
|
||||
if ((ziU8)candidate->text[position] != (ziU8)word->text[position]) break;
|
||||
position++;
|
||||
}
|
||||
if (position == length) {
|
||||
@@ -56,7 +56,8 @@ ziBool Zi8_81480224(ziUserWord* word ZI_NEED_WORK) {
|
||||
previous = current;
|
||||
current = current->next;
|
||||
}
|
||||
length = ZI_WORK->uwdCount++;
|
||||
length = ZI_WORK->uwdCount;
|
||||
ZI_WORK->uwdCount = length + 1;
|
||||
added = &ZI_WORK->uwdNodes[length];
|
||||
if (previous == 0) {
|
||||
ZI_WORK->uwdList = added;
|
||||
@@ -90,11 +91,8 @@ ziU8 Zi8MatchUWDdata(ziWChar* pattern, ziU8 length, ziWChar* currentWord, ziU16
|
||||
ziWChar folded;
|
||||
int fallback = 0;
|
||||
int visited = 0;
|
||||
int prefixLength;
|
||||
int position, previousOffset;
|
||||
ziU32 size;
|
||||
ziU8 entryLanguage;
|
||||
ziU32 entryLength;
|
||||
int position, prefixLength, previousOffset;
|
||||
ziU32 size, entryLanguage, entryLength;
|
||||
ziU8* cursor;
|
||||
ziU8* begin;
|
||||
ziU8* boundary;
|
||||
@@ -105,33 +103,18 @@ ziU8 Zi8MatchUWDdata(ziWChar* pattern, ziU8 length, ziWChar* currentWord, ziU16
|
||||
ziUserDictionary* dictionary;
|
||||
int firstSegment;
|
||||
Zi8LogError(100, __zi8_work_data);
|
||||
if (!(ZI_WORK->unk_0x138 <= 2 && ZI_WORK->unk_0x138 != 0 && ZI_WORK->unk_0x130[ZI_WORK->unk_0x138 - 1] != 0)) {
|
||||
if (!(ZI_WORK->unk_0x138 < 3 && ZI_WORK->unk_0x138 != 0 && ZI_WORK->unk_0x130[ZI_WORK->unk_0x138 - 1] != 0)) {
|
||||
Zi8ReplaceLastError(0x19C, __zi8_work_data);
|
||||
return 0;
|
||||
}
|
||||
dictionary = ZI_WORK->unk_0x130[ZI_WORK->unk_0x138 - 1];
|
||||
if (continuation != 0) {
|
||||
result = Zi8_814803F4(__zi8_work_data);
|
||||
entryLength = 0;
|
||||
if (result != 0) {
|
||||
entryLanguage = result->language;
|
||||
entryLength = result->length;
|
||||
if (entryLength >= capacity) {
|
||||
Zi8_8148047C(__zi8_work_data);
|
||||
return 0;
|
||||
}
|
||||
for (position = 0; position < (ziS32)entryLength; position++) output[position] = Zi8ConvertUC2WC(result->text[position], entryLanguage, __zi8_work_data);
|
||||
}
|
||||
return entryLength;
|
||||
}
|
||||
{
|
||||
if (continuation == 0) {
|
||||
Zi8_8148047C(__zi8_work_data);
|
||||
ZI_WORK->unk_0x13C = 0;
|
||||
if (currentWord == 0 || currentLength == 0 || currentWord[currentLength - 1] != 0x20) ZI_WORK->unk_0x140 = 0;
|
||||
else {
|
||||
prefixLength = 0;
|
||||
for (position = currentLength - 2; currentWord[position] != 0x20 && position >= 0; position--) prefixLength++;
|
||||
position++;
|
||||
for (position = currentLength - 2; position >= 0 && currentWord[position] != 0x20; position--) prefixLength++;
|
||||
if (prefixLength == 0 || prefixLength > 63) ZI_WORK->unk_0x140 = 0;
|
||||
else {
|
||||
ZI_WORK->unk_0x140 = 1;
|
||||
@@ -140,7 +123,7 @@ ziU8 Zi8MatchUWDdata(ziWChar* pattern, ziU8 length, ziWChar* currentWord, ziU16
|
||||
ZI_WORK->unk_0x141[1] = language;
|
||||
ZI_WORK->unk_0x141[2] = prefixLength;
|
||||
previousOffset = 4;
|
||||
for (; prefixLength > 0; prefixLength--, position++) {
|
||||
for (; ++position, prefixLength > 0; prefixLength--) {
|
||||
folded = currentWord[position];
|
||||
ZI_WORK->unk_0x141[previousOffset] = Zi8ConvertWC2UC(folded, language, __zi8_work_data);
|
||||
ZI_WORK->unk_0x184[previousOffset] = 0;
|
||||
@@ -148,10 +131,12 @@ ziU8 Zi8MatchUWDdata(ziWChar* pattern, ziU8 length, ziWChar* currentWord, ziU16
|
||||
if (!Zi8ChangeCharCase(1, &folded, language, __zi8_work_data)) Zi8ChangeCharCase(0, &folded, language, __zi8_work_data);
|
||||
ZI_WORK->unk_0x184[previousOffset] = Zi8ConvertWC2UC(folded, language, __zi8_work_data);
|
||||
}
|
||||
if (ZI_WORK->unk_0x141[previousOffset++] == 0) {
|
||||
if (ZI_WORK->unk_0x141[previousOffset] == 0) {
|
||||
ZI_WORK->unk_0x140 = 0;
|
||||
previousOffset++;
|
||||
break;
|
||||
}
|
||||
previousOffset++;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -161,8 +146,7 @@ rescan:
|
||||
boundary = (ziU8*)dictionary + dictionary->boundary + 7;
|
||||
end = (ziU8*)dictionary + dictionary->end + 7;
|
||||
cursor = begin;
|
||||
if (begin < boundary) firstSegment = 1;
|
||||
else firstSegment = 0;
|
||||
firstSegment = begin < boundary;
|
||||
while (firstSegment ? cursor < boundary : cursor < end) {
|
||||
size = *cursor;
|
||||
candidate = (ziUserWord*)cursor;
|
||||
@@ -201,7 +185,7 @@ next:
|
||||
visited = 0;
|
||||
goto rescan;
|
||||
}
|
||||
if (complete == 1 && length != 0 && continuation == 0) {
|
||||
if (complete != 0 && length == 1) {
|
||||
complete = 0;
|
||||
fallback = 1;
|
||||
visited = 0;
|
||||
|
||||
@@ -22,8 +22,7 @@ ziU32 ZiDAWGGetChild(ziU32 node) {
|
||||
node += offset;
|
||||
if (((ziU32)header & 2) != 0) {
|
||||
if ((*(ziU8*)node & 0x80) != 0) {
|
||||
offset = (*(ziU8*)node & 0x7f) * 0x10000 + ((ziU32)*((ziU8*)node + 1) & 0xffff) * 0x100 + 0x8000;
|
||||
offset += *((ziU8*)node + 2);
|
||||
offset = *((ziU8*)node + 2) + ((*(ziU8*)node & 0x7f) * 0x10000 + ((ziU32)*((ziU8*)node + 1) & 0xffff) * 0x100 + 0x8000);
|
||||
} else {
|
||||
offset = ((ziU32)*(ziU8*)node & 0xffff) * 0x100;
|
||||
offset += (ziU32)*((ziU8*)node + 1);
|
||||
@@ -44,7 +43,7 @@ ziU32 ZiDAWGGetChild(ziU32 node) {
|
||||
|
||||
ziU8* ZiDAWGGetSibling(ziU8* node) {
|
||||
ziU16 header;
|
||||
ziU8* cursor = node;
|
||||
ziU8* cursor;
|
||||
ziS32 depth;
|
||||
ziS32 offset;
|
||||
|
||||
@@ -54,29 +53,29 @@ ziU8* ZiDAWGGetSibling(ziU8* node) {
|
||||
if ((header & 4) == 0) {
|
||||
node = 0;
|
||||
} else {
|
||||
cursor = node;
|
||||
if ((header & 8) != 0) {
|
||||
if ((node[0] & 0xf) == 0xf) {
|
||||
node += 2;
|
||||
cursor = node + 2;
|
||||
} else {
|
||||
node += 1;
|
||||
cursor = node + 1;
|
||||
}
|
||||
|
||||
if ((header & 2) != 0) {
|
||||
if ((*node & 0x80) == 0) {
|
||||
node += 2;
|
||||
if ((*cursor & 0x80) == 0) {
|
||||
cursor += 2;
|
||||
} else {
|
||||
node += 3;
|
||||
cursor += 3;
|
||||
}
|
||||
}
|
||||
|
||||
if ((*node & 0x80) != 0) {
|
||||
node += (*node & 0x7f) * 0x10000 + (ziU32)node[1] * 0x100 +
|
||||
(ziU32)node[2] + 0x8000;
|
||||
if ((*cursor & 0x80) == 0) {
|
||||
node += (ziU32)cursor[1] + (ziU32)*cursor * 0x100;
|
||||
} else {
|
||||
node += (ziU16)*node * 0x100 + (ziU32)node[1];
|
||||
node += (*cursor & 0x7f) * 0x10000 + (ziU32)cursor[1] * 0x100 +
|
||||
0x8000 + (ziU32)cursor[2];
|
||||
}
|
||||
} else {
|
||||
cursor = node;
|
||||
do {
|
||||
header = nodeHeaderTable[cursor[0] >> 4];
|
||||
if ((cursor[0] & 0xf) == 0xf) {
|
||||
@@ -90,24 +89,24 @@ ziU8* ZiDAWGGetSibling(ziU8* node) {
|
||||
if ((header & 1) != 0) {
|
||||
if ((header & 2) == 0) {
|
||||
depth++;
|
||||
} else if ((*cursor & 0x80) != 0) {
|
||||
cursor += 3;
|
||||
offset += 3;
|
||||
} else {
|
||||
} else if ((*cursor & 0x80) == 0) {
|
||||
cursor += 2;
|
||||
offset += 2;
|
||||
} else {
|
||||
cursor += 3;
|
||||
offset += 3;
|
||||
}
|
||||
}
|
||||
|
||||
if ((header & 4) == 0) {
|
||||
depth--;
|
||||
} else if ((header & 8) != 0) {
|
||||
if ((*cursor & 0x80) != 0) {
|
||||
cursor += 3;
|
||||
offset += 3;
|
||||
} else {
|
||||
if ((*cursor & 0x80) == 0) {
|
||||
cursor += 2;
|
||||
offset += 2;
|
||||
} else {
|
||||
cursor += 3;
|
||||
offset += 3;
|
||||
}
|
||||
depth--;
|
||||
}
|
||||
@@ -164,10 +163,16 @@ ziU32 ZiDAWGGetGraphInfo(zi8DawgCtx* context, ziU8* entry, ziU16* keys) {
|
||||
result = 0;
|
||||
pair = (((ziU16)entry[0] << 8) + entry[1]);
|
||||
if (pair != 0) {
|
||||
return 0;
|
||||
goto graph_invalid;
|
||||
}
|
||||
pair = (((ziU16)entry[2] << 8) + entry[3]);
|
||||
if (pair == 0) {
|
||||
goto graph_valid;
|
||||
}
|
||||
graph_invalid:
|
||||
result = 0;
|
||||
goto graph_done;
|
||||
graph_valid:
|
||||
end = (ziU32)(entry + (((ziU16)entry[4] << 8) + entry[5] + 1) * 10);
|
||||
entry += 10;
|
||||
depth = 0;
|
||||
@@ -177,18 +182,19 @@ ziU32 ZiDAWGGetGraphInfo(zi8DawgCtx* context, ziU8* entry, ziU16* keys) {
|
||||
}
|
||||
|
||||
while (1) {
|
||||
if (*keys == (ziS32)(entry[3] + ((ziU16)entry[2] << 8))) {
|
||||
if (*keys == (ziU16)(entry[3] + ((ziU16)entry[2] << 8))) {
|
||||
break;
|
||||
}
|
||||
entry += (entry[1] + ((ziU16)entry[0] << 8)) * 10 + 10;
|
||||
if (((ziU32)entry >= end) ||
|
||||
(*keys == (ziS32)(entry[3] + ((ziU16)entry[2] << 8)))) {
|
||||
if ((end <= (ziU32)entry) ||
|
||||
(*keys == (ziU16)(entry[3] + ((ziU16)entry[2] << 8)))) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if ((ziU32)entry >= end) {
|
||||
return 0;
|
||||
if (end <= (ziU32)entry) {
|
||||
result = 0;
|
||||
break;
|
||||
}
|
||||
|
||||
result = graph + (ziU32)entry[4] * 0x10000 + ((ziU16)entry[5] << 8) +
|
||||
@@ -209,7 +215,8 @@ ziU32 ZiDAWGGetGraphInfo(zi8DawgCtx* context, ziU8* entry, ziU16* keys) {
|
||||
depth++;
|
||||
keys++;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
graph_done:
|
||||
return result;
|
||||
}
|
||||
|
||||
@@ -17,7 +17,7 @@ typedef struct ziUserKeys {
|
||||
typedef struct ziChineseEntry {
|
||||
ziU8 data[9];
|
||||
ziU8 offsetHigh;
|
||||
ziU8 offsetLow[2];
|
||||
ziU16 offsetLow;
|
||||
} ziChineseEntry;
|
||||
|
||||
ziU8 Zi8GetCandidatesOrCount(ziGetParam*, ziSearchState* ZI_NEED_WORK);
|
||||
@@ -26,22 +26,19 @@ ziPtr Zi8GetTableAddress(ziU8, ziU8 ZI_NEED_WORK);
|
||||
ziU16 Zi8Uni2Ord(ziWChar ZI_NEED_WORK);
|
||||
|
||||
ziBool Zi8IsWordW(ziWChar* word, ziU8 language ZI_NEED_WORK) {
|
||||
int count;
|
||||
int offset;
|
||||
ziU8 group;
|
||||
ziU8 remaining;
|
||||
ziU16 value;
|
||||
ziU8 remaining, group;
|
||||
ziU16 value = 0;
|
||||
ziWChar* cursor;
|
||||
ziU8 formats[8] = {1, 5, 0, 0, 0, 0, 0, 0};
|
||||
ziSearchState search;
|
||||
ziGetParam request;
|
||||
ziWChar ordinals[65];
|
||||
int length;
|
||||
ziU32 savedFormats = ZI_WORK->unk_0x1410;
|
||||
ziU8 savedCount = ZI_WORK->unk_0x1418;
|
||||
int length, count, offset;
|
||||
int unmatched;
|
||||
ziChineseEntry* entry;
|
||||
ziU8* data;
|
||||
ziU8 formats[8] = {1, 5, 0, 0, 0, 0, 0, 0};
|
||||
ziU32 savedFormats = ZI_WORK->unk_0x1410;
|
||||
ziU8 savedCount = ZI_WORK->unk_0x1418;
|
||||
search.flags = 0;
|
||||
search.word = 0;
|
||||
search.length = 0;
|
||||
@@ -55,7 +52,7 @@ ziBool Zi8IsWordW(ziWChar* word, ziU8 language ZI_NEED_WORK) {
|
||||
}
|
||||
if (language != 1) {
|
||||
for (length = 0; word[length] != 0; length++) {
|
||||
if (word[length] >= 0xEFF1 || length == 64) return 0;
|
||||
if (word[length] > 0xEFF0 || length == 64) return 0;
|
||||
}
|
||||
((ziU8*)&search.length)[0] = length;
|
||||
((ziU8*)&search.flags)[2] = 1;
|
||||
@@ -94,34 +91,21 @@ ziBool Zi8IsWordW(ziWChar* word, ziU8 language ZI_NEED_WORK) {
|
||||
if (language == 1) {
|
||||
length = 0;
|
||||
do {
|
||||
ordinals[length] = Zi8Uni2Ord(word[length], __zi8_work_data);
|
||||
if (ordinals[length] == 0xFFFF) return 0;
|
||||
length++;
|
||||
if (length == 64) return 0;
|
||||
} while (word[length] != 0);
|
||||
{
|
||||
if (word[length] == 0) {
|
||||
count = length - 1;
|
||||
if (length == 1) return 1;
|
||||
count = --length;
|
||||
ordinals[count] |= 0x8000;
|
||||
ZI_WORK->unk_0x16 = Zi8GetFormatVersion(1, __zi8_work_data) & 2;
|
||||
entry = (ziChineseEntry*)Zi8GetTableAddress(1, 0, __zi8_work_data) + ordinals[0];
|
||||
data = (ziU8*)Zi8GetTableAddress(1, 1, __zi8_work_data) + ((entry->offsetHigh & 15) << 16 | ((entry->offsetLow[0] << 8) | entry->offsetLow[1]));
|
||||
data = (ziU8*)Zi8GetTableAddress(1, 1, __zi8_work_data) + ((entry->offsetHigh & 15) << 16 | entry->offsetLow);
|
||||
if (ZI_WORK->unk_0x16 != 0) {
|
||||
switch (*data & 7) {
|
||||
case 2:
|
||||
offset = 2;
|
||||
break;
|
||||
case 3:
|
||||
case 4:
|
||||
offset = 3;
|
||||
break;
|
||||
case 5:
|
||||
offset = 4;
|
||||
break;
|
||||
default:
|
||||
offset = 1;
|
||||
break;
|
||||
}
|
||||
group = *data & 7;
|
||||
if (group == 5) offset = 4;
|
||||
else if (group < 5) {
|
||||
if (group == 2) offset = 2;
|
||||
else if (group < 2) offset = 1;
|
||||
else offset = 3;
|
||||
} else offset = 1;
|
||||
data += offset;
|
||||
}
|
||||
if ((*data & 0x80) == 0) return 0;
|
||||
@@ -150,7 +134,11 @@ ziBool Zi8IsWordW(ziWChar* word, ziU8 language ZI_NEED_WORK) {
|
||||
}
|
||||
Zi8LogError(0x2BD, __zi8_work_data);
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
ordinals[length] = Zi8Uni2Ord(word[length], __zi8_work_data);
|
||||
if (ordinals[length] == 0xFFFF) return 0;
|
||||
length++;
|
||||
} while (length != 64);
|
||||
} else Zi8ReplaceLastError(0x26C, __zi8_work_data);
|
||||
return 0;
|
||||
}
|
||||
@@ -168,9 +156,10 @@ ziWChar Zi8ConvertUC2UserKey(ziChar character, ziU8 language ZI_NEED_WORK) {
|
||||
}
|
||||
}
|
||||
found:
|
||||
if (key >= 32) return 0;
|
||||
if (key == 0) return 0xEFFA;
|
||||
if (key >= 1 && key <= 9) return key + 0xEFF0;
|
||||
if (key <= 31) return key + 0xEFF1;
|
||||
if (key < 32) {
|
||||
if (key == 0) return 0xEFFA;
|
||||
if (key >= 1 && key <= 9) return key + 0xEFF0;
|
||||
if (key <= 31) return key + 0xEFF1;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -44,12 +44,13 @@ static ziU8 ziNumKeysWithChars(ziU8 language, ziPtr __zi8_work_data) {
|
||||
}
|
||||
|
||||
ziBool Zi8getKeyLayout(ziU8 language, ziWChar key, ziWChar* chars, ziU8 mode, ziPtr __zi8_work_data) {
|
||||
ziU16 tableCount;
|
||||
ziU8 numKeys;
|
||||
ziU16 tableCount;
|
||||
ziU8* dataAddress;
|
||||
ziUserKeyMap* customTable;
|
||||
ziU32 totalCharacters;
|
||||
ziU16 charCount;
|
||||
ziU16 keyIndex;
|
||||
ziU32 keyIndex;
|
||||
ziWChar* keyChars;
|
||||
|
||||
dataAddress = 0;
|
||||
@@ -92,15 +93,15 @@ tables_ready:
|
||||
return 0;
|
||||
}
|
||||
|
||||
tableCount = 0;
|
||||
keyIndex = tableCount;
|
||||
totalCharacters = 0;
|
||||
keyIndex = totalCharacters;
|
||||
for (; (ziU16)keyIndex < key; keyIndex++) {
|
||||
tableCount += dataAddress[(ziU16)keyIndex];
|
||||
totalCharacters += dataAddress[(ziU16)keyIndex];
|
||||
}
|
||||
if ((charCount = (ziU8)dataAddress[key]) == 0) {
|
||||
return 0;
|
||||
}
|
||||
dataAddress = dataAddress + numKeys + (tableCount * 2);
|
||||
dataAddress = dataAddress + numKeys + ((totalCharacters & 0xffff) * 2);
|
||||
keyIndex = 0;
|
||||
for (; (ziU16)keyIndex < charCount; keyIndex++) {
|
||||
chars[(ziU16)keyIndex] = (ziU16)dataAddress[(ziU16)keyIndex * 2] |
|
||||
|
||||
@@ -23,60 +23,48 @@ ziU8 Zi8DetachOEMdata(ziU8 id ZI_NEED_WORK) {
|
||||
}
|
||||
ziU8 Zi8MatchOEMdata(ziWChar* pattern, ziU8 length, ziU8 language, ziWChar* word, ziU16 capacity, ziBool complete, ziBool continuation ZI_NEED_WORK) {
|
||||
ziWChar folded;
|
||||
ziS32 index;
|
||||
ziU8 fallback = 0;
|
||||
ziU32 index;
|
||||
ziU32 position;
|
||||
ziU32 fallback = 0;
|
||||
if (!continuation) ZI_WORK->oemIdx = 0;
|
||||
index = ZI_WORK->oemIdx;
|
||||
if ((ziS32)index >= ZI_WORK->oemLen) goto failed;
|
||||
if (ZI_WORK->oemMatch == 0) goto failed;
|
||||
if ((ziS32)index >= ZI_WORK->oemLen || ZI_WORK->oemMatch == 0) goto noMatch;
|
||||
capacity--;
|
||||
if ((ziS32)length >= (ziS32)capacity) {
|
||||
failed:
|
||||
return 0;
|
||||
}
|
||||
if (length >= capacity) goto noMatch;
|
||||
word[capacity] = 0;
|
||||
if (complete) word[length] = 1; else word[length] = 0;
|
||||
goto matchRetry;
|
||||
posEntry:
|
||||
position = 0;
|
||||
if ((complete && word[length] == 0) || (!complete && word[length] != 0)) {
|
||||
for (; (ziS32)position < length; position++) {
|
||||
if (pattern[position] >= 0xEFF1 && pattern[position] <= 0xF37F) {
|
||||
if (pattern[position] == Zi8ConvertWC2Key(word[position], language, __zi8_work_data)) continue;
|
||||
break;
|
||||
} else if (word[position] != pattern[position]) {
|
||||
if (!ZI_WORK->unk_0x1F || language == 1) break;
|
||||
folded = pattern[position];
|
||||
if (!Zi8ChangeCharCase(1, &folded, language, __zi8_work_data) || folded != word[position]) break;
|
||||
word[length] = complete ? 1 : 0;
|
||||
for (;;) {
|
||||
if ((ziS32)index >= ZI_WORK->oemLen || !ZI_WORK->oemMatch(index, word, capacity, ZI_WORK->oemData)) {
|
||||
if (length != 1 || !complete || continuation) goto noMatch;
|
||||
complete = 0;
|
||||
fallback = 1;
|
||||
index = 0;
|
||||
continue;
|
||||
}
|
||||
position = 0;
|
||||
if ((complete && word[length] == 0) || (!complete && word[length] != 0)) {
|
||||
for (; (ziS32)position < length; position++) {
|
||||
if (pattern[position] < 0xEFF1 || pattern[position] > 0xF37F) {
|
||||
if (word[position] != pattern[position]) {
|
||||
if (!ZI_WORK->unk_0x1F || language == 1) break;
|
||||
folded = pattern[position];
|
||||
if (!Zi8ChangeCharCase(1, &folded, language, __zi8_work_data) || folded != word[position]) break;
|
||||
}
|
||||
} else if (pattern[position] != Zi8ConvertWC2Key(word[position], language, __zi8_work_data)) break;
|
||||
}
|
||||
}
|
||||
}
|
||||
if ((ziS32)position < length) {
|
||||
if (complete) word[length] = 1; else word[length] = 0;
|
||||
if ((ziS32)position >= length) {
|
||||
if (fallback) {
|
||||
*word = *pattern;
|
||||
return 1;
|
||||
}
|
||||
ZI_WORK->oemIdx = index + 1;
|
||||
while (word[position] != 0) position++;
|
||||
return position;
|
||||
}
|
||||
word[length] = complete ? 1 : 0;
|
||||
index++;
|
||||
if ((ziS32)index >= ZI_WORK->oemLen) goto oemFailed;
|
||||
goto matchRetry;
|
||||
}
|
||||
if (fallback) {
|
||||
index = 0;
|
||||
*word = *pattern;
|
||||
return 1;
|
||||
}
|
||||
index++;
|
||||
ZI_WORK->oemIdx = index;
|
||||
while (word[position] != 0) position++;
|
||||
return position;
|
||||
matchRetry:
|
||||
if ((ziS32)index >= ZI_WORK->oemLen) goto oemFailed;
|
||||
if (!ZI_WORK->oemMatch(index, word, capacity, ZI_WORK->oemData)) goto oemFailed;
|
||||
goto posEntry;
|
||||
oemFailed:
|
||||
if (length != 1 || !complete || continuation) goto tail0;
|
||||
complete = 0;
|
||||
fallback = 1;
|
||||
index = 0;
|
||||
goto matchRetry;
|
||||
tail0:
|
||||
noMatch:
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -457,7 +457,7 @@ void bta_dm_signal_strength(tBTA_DM_MSG *p_data);
|
||||
|
||||
void bta_dm_acl_change(tBTA_DM_MSG *p_data);
|
||||
|
||||
BOOLEAN bta_sys_check_compress(int id, UINT8 app_id, BD_ADDR peer_addr);
|
||||
BOOLEAN bta_sys_check_compress(int, UINT8 app_id, BD_ADDR peer_addr);
|
||||
|
||||
void bta_dm_keep_acl(tBTA_DM_MSG *p_data);
|
||||
void bta_dm_immediate_disable(void);
|
||||
|
||||
@@ -151,7 +151,7 @@ UINT8 L2CA_SetTraceLevel(UINT8 new_level);
|
||||
UINT8 L2CA_SetDesireRole(UINT8 new_role);
|
||||
BOOLEAN L2CA_SetAclPriority(BD_ADDR bd_addr, UINT8 priority);
|
||||
void L2CA_SetCompression(UINT16 local_cid, UINT8 pe_type, UINT8 mem_level,
|
||||
UINT8 wbits, UINT8 direction, UINT8 config,
|
||||
UINT8 wbits, UINT8 direction, UINT8 param_6,
|
||||
UINT8 enable);
|
||||
void L2CA_RegisterCompression(tL2CA_COMPRESS_CB *, signed);
|
||||
UINT8 L2CA_Flush(UINT16 cid);
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
|
||||
#include <revolution/types.h>
|
||||
|
||||
s32 uhf_ker_create_sem(u32 initCount, int flags);
|
||||
s32 uhf_ker_create_sem(u32 param_1, int param_2);
|
||||
s32 uhf_ker_delete_sem(int sem);
|
||||
|
||||
s32 uhf_ker_get_sem(int sem);
|
||||
|
||||
@@ -62,9 +62,9 @@ typedef struct CXUncompContextHuffman {
|
||||
CXHuffmanDecodeTableEntry decodeTableData[0x200]; // 0x20
|
||||
} CXUncompContextHuffman;
|
||||
|
||||
void CXInitUncompContextRL(CXUncompContextRL* context, u8* data);
|
||||
void CXInitUncompContextLZ(CXUncompContextLZ* context, u8* data);
|
||||
void CXInitUncompContextHuffman(CXUncompContextHuffman* context, u8* data);
|
||||
void CXInitUncompContextRL(CXUncompContextRL* context, u8* param_2);
|
||||
void CXInitUncompContextLZ(CXUncompContextLZ* context, u8* param_2);
|
||||
void CXInitUncompContextHuffman(CXUncompContextHuffman* context, u8* param_2);
|
||||
|
||||
CXStreamingResult CXReadUncompRL(CXUncompContextRL* context, const void* src, u32 size);
|
||||
CXStreamingResult CXReadUncompLZ(CXUncompContextLZ* context, const void* src, u32 size);
|
||||
|
||||
@@ -40,7 +40,7 @@ ISD_Error ISD_ProbeCard(u32 slot);
|
||||
ISD_Error ISD_MountCard(u32 slot, SDDev** dev);
|
||||
ISD_Error ISD_UnmountCard(SDDev* dev);
|
||||
|
||||
ISD_Error ISD_GetHCRegister(SDDev* dev, u32 reg, u32* outValue, u32 size) NO_INLINE;
|
||||
ISD_Error ISD_GetHCRegister(SDDev* dev, u32 param_2, u32* param_3, u32 param_4) NO_INLINE;
|
||||
|
||||
ISD_Error ISD_ReadBlock(SDDev* dev, u32 offset, u8* cmdResp, u32 cmdRespSize);
|
||||
ISD_Error ISD_WriteBlock(SDDev* dev, u32 offset, u8* cmdResp, u32 cmdRespSize);
|
||||
|
||||
@@ -33,8 +33,8 @@ typedef struct USBKBDCmdLEDAsync {
|
||||
|
||||
USBKBDErr USBKBDInitialize(USBKBDAttachCallback attachCb, USBKBDDetachCallback detachCb);
|
||||
|
||||
USBKBDErr USBKBDSetLED(u32 device, u8 ledBits, USBKBDCmdLED* cmd);
|
||||
USBKBDErr USBKBDSetLEDAsync(u32 device, u8 ledBits, USBKBDCmdLEDAsync* cmd, USBKBDCmdLEDCallback cb, void* cbArg);
|
||||
USBKBDErr USBKBDSetLED(u32, u8, USBKBDCmdLED* cmd);
|
||||
USBKBDErr USBKBDSetLEDAsync(u32, u8, USBKBDCmdLEDAsync* cmd, USBKBDCmdLEDCallback cb, void* cbArg);
|
||||
|
||||
USBKBDErr USBKBDRegisterEventCallback(USBKBDEventCallback cb);
|
||||
|
||||
|
||||
@@ -1376,7 +1376,7 @@ static void bta_dm_link_quality_cback(tBTM_LINK_QUALITY_RESULTS *p_result)
|
||||
}
|
||||
}
|
||||
|
||||
BOOLEAN bta_sys_check_compress(int id, UINT8 app_id, BD_ADDR peer_addr)
|
||||
BOOLEAN bta_sys_check_compress(int param_1, UINT8 app_id, BD_ADDR peer_addr)
|
||||
{
|
||||
BOOLEAN status = FALSE;
|
||||
int i;
|
||||
@@ -1399,8 +1399,8 @@ BOOLEAN bta_sys_check_compress(int id, UINT8 app_id, BD_ADDR peer_addr)
|
||||
}
|
||||
|
||||
static BOOLEAN bta_dm_l2cap_server_compress_cback(
|
||||
BD_ADDR peer_addr, int pe_type, int mem_level, int wbits,
|
||||
int direction, int config, int enable, UINT8 **p_mem_pool,
|
||||
BD_ADDR peer_addr, int param_2, int param_3, int param_4,
|
||||
int param_5, int param_6, int param_7, UINT8 **p_mem_pool,
|
||||
UINT32 *mem_pool_size)
|
||||
{
|
||||
BOOLEAN status = FALSE;
|
||||
|
||||
@@ -22,7 +22,7 @@ void bte_hcisu_send(HC_BT_HDR *p_msg, UINT16 event)
|
||||
GKI_freebuf(p_msg);
|
||||
}
|
||||
|
||||
void bte_hcisu_task(int unused)
|
||||
void bte_hcisu_task(int param_1)
|
||||
{
|
||||
if (p_hcisu_if)
|
||||
{
|
||||
|
||||
@@ -152,11 +152,11 @@ void BTA_CleanUp(tBTA_APP_INFO_CBACK *p_cb)
|
||||
GKI_shutdown();
|
||||
}
|
||||
|
||||
void bta_usb_close_evt(INT8 status)
|
||||
void bta_usb_close_evt(INT8 param_1)
|
||||
{
|
||||
if (_bte_app_info)
|
||||
{
|
||||
if (status >= 0)
|
||||
if (param_1 >= 0)
|
||||
(*_bte_app_info)(0);
|
||||
else
|
||||
(*_bte_app_info)(1);
|
||||
|
||||
@@ -113,20 +113,20 @@ static UINT16 const hcisu_msg_evt_table[] =
|
||||
MSG_HC_TO_STACK_HCI_EVT,
|
||||
};
|
||||
|
||||
void hcisu_h2_usb_cback(UINT8 event, INT8 status)
|
||||
void hcisu_h2_usb_cback(UINT8 param_1, INT8 param_2)
|
||||
{
|
||||
switch (event)
|
||||
switch (param_1)
|
||||
{
|
||||
case 0:
|
||||
break;
|
||||
|
||||
case 4:
|
||||
bta_usb_close_evt(status);
|
||||
bta_usb_close_evt(param_2);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
UINT16 hcisu_h2_receive_msg(UINT16 pipe, tHCISU_H2_CB *p_cb)
|
||||
UINT16 hcisu_h2_receive_msg(UINT16 param_1, tHCISU_H2_CB *p_cb)
|
||||
{
|
||||
UINT16 bytes_read = 0;
|
||||
UINT8 byte;
|
||||
@@ -138,7 +138,7 @@ UINT16 hcisu_h2_receive_msg(UINT16 pipe, tHCISU_H2_CB *p_cb)
|
||||
if (p_cb->at_0x1e != 2)
|
||||
return 0;
|
||||
|
||||
r27 = pipe + 1;
|
||||
r27 = param_1 + 1;
|
||||
|
||||
while (TRUE)
|
||||
{
|
||||
@@ -148,36 +148,36 @@ UINT16 hcisu_h2_receive_msg(UINT16 pipe, tHCISU_H2_CB *p_cb)
|
||||
++bytes_read;
|
||||
msg_received = FALSE;
|
||||
|
||||
switch (p_cb->at_0x1a[pipe])
|
||||
switch (p_cb->at_0x1a[param_1])
|
||||
{
|
||||
case 0:
|
||||
if (r27 == 1)
|
||||
{
|
||||
p_cb->at_0x00[pipe] = GKI_getpoolbuf(GKI_POOL_ID_2);
|
||||
p_cb->at_0x14[pipe] = 4;
|
||||
p_cb->at_0x00[param_1] = GKI_getpoolbuf(GKI_POOL_ID_2);
|
||||
p_cb->at_0x14[param_1] = 4;
|
||||
}
|
||||
else if (r27 == 2)
|
||||
{
|
||||
p_cb->at_0x00[pipe] = GKI_getpoolbuf(GKI_POOL_ID_3);
|
||||
p_cb->at_0x14[pipe] = 2;
|
||||
p_cb->at_0x00[param_1] = GKI_getpoolbuf(GKI_POOL_ID_3);
|
||||
p_cb->at_0x14[param_1] = 2;
|
||||
}
|
||||
else if (r27 == 3)
|
||||
{
|
||||
p_cb->at_0x00[pipe] = GKI_getpoolbuf(GKI_POOL_ID_1);
|
||||
p_cb->at_0x14[pipe] = 3;
|
||||
p_cb->at_0x00[param_1] = GKI_getpoolbuf(GKI_POOL_ID_1);
|
||||
p_cb->at_0x14[param_1] = 3;
|
||||
}
|
||||
else
|
||||
{
|
||||
break;
|
||||
}
|
||||
|
||||
if (p_cb->at_0x00[pipe])
|
||||
if (p_cb->at_0x00[param_1])
|
||||
{
|
||||
p_cb->at_0x00[pipe]->len = 0;
|
||||
p_cb->at_0x00[pipe]->event =
|
||||
hcisu_msg_evt_table[p_cb->at_0x14[pipe] - 1];
|
||||
p_cb->at_0x00[pipe]->offset = 0;
|
||||
p_cb->at_0x1a[pipe] = 1;
|
||||
p_cb->at_0x00[param_1]->len = 0;
|
||||
p_cb->at_0x00[param_1]->event =
|
||||
hcisu_msg_evt_table[p_cb->at_0x14[param_1] - 1];
|
||||
p_cb->at_0x00[param_1]->offset = 0;
|
||||
p_cb->at_0x1a[param_1] = 1;
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -185,54 +185,54 @@ UINT16 hcisu_h2_receive_msg(UINT16 pipe, tHCISU_H2_CB *p_cb)
|
||||
"HCIS: Unable to allocate buffer for incoming HCI "
|
||||
"message.");
|
||||
|
||||
p_cb->at_0x1a[pipe] = 2;
|
||||
p_cb->at_0x1a[param_1] = 2;
|
||||
}
|
||||
|
||||
p_cb->at_0x0c[pipe] =
|
||||
hcisu_preamble_table[p_cb->at_0x14[pipe] - 1];
|
||||
p_cb->at_0x0c[param_1] =
|
||||
hcisu_preamble_table[p_cb->at_0x14[param_1] - 1];
|
||||
|
||||
/* fallthrough */
|
||||
|
||||
case 1:
|
||||
*((UINT8 *)(p_cb->at_0x00[pipe] + 1)
|
||||
+ p_cb->at_0x00[pipe]->len++) = byte;
|
||||
*((UINT8 *)(p_cb->at_0x00[param_1] + 1)
|
||||
+ p_cb->at_0x00[param_1]->len++) = byte;
|
||||
|
||||
--p_cb->at_0x0c[pipe];
|
||||
--p_cb->at_0x0c[param_1];
|
||||
|
||||
if (p_cb->at_0x0c[pipe] == 0)
|
||||
if (p_cb->at_0x0c[param_1] == 0)
|
||||
{
|
||||
msg_len = byte;
|
||||
|
||||
if (p_cb->at_0x14[pipe] == 2)
|
||||
if (p_cb->at_0x14[param_1] == 2)
|
||||
{
|
||||
msg_len = (msg_len << 8) + p_cb->at_0x17[pipe];
|
||||
msg_len = (msg_len << 8) + p_cb->at_0x17[param_1];
|
||||
|
||||
if ((p_cb->at_0x00[pipe] =
|
||||
if ((p_cb->at_0x00[param_1] =
|
||||
(HC_BT_HDR *)l2cap_link_chk_pkt_start(
|
||||
(BT_HDR *)p_cb->at_0x00[pipe]))
|
||||
(BT_HDR *)p_cb->at_0x00[param_1]))
|
||||
== 0)
|
||||
{
|
||||
p_cb->at_0x0c[pipe] = msg_len;
|
||||
p_cb->at_0x0c[param_1] = msg_len;
|
||||
|
||||
if (msg_len == 0)
|
||||
p_cb->at_0x1a[pipe] = 0;
|
||||
p_cb->at_0x1a[param_1] = 0;
|
||||
else
|
||||
p_cb->at_0x1a[pipe] = 4;
|
||||
p_cb->at_0x1a[param_1] = 4;
|
||||
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
p_cb->at_0x0c[pipe] = msg_len;
|
||||
p_cb->at_0x0c[param_1] = msg_len;
|
||||
|
||||
if (sizeof(HC_BT_HDR)
|
||||
+ hcisu_preamble_table[p_cb->at_0x14[pipe] - 1]
|
||||
+ hcisu_preamble_table[p_cb->at_0x14[param_1] - 1]
|
||||
+ msg_len
|
||||
> GKI_get_buf_size(p_cb->at_0x00[pipe]))
|
||||
> GKI_get_buf_size(p_cb->at_0x00[param_1]))
|
||||
{
|
||||
GKI_freebuf(p_cb->at_0x00[pipe]);
|
||||
p_cb->at_0x00[pipe] = NULL;
|
||||
p_cb->at_0x1a[pipe] = 4;
|
||||
GKI_freebuf(p_cb->at_0x00[param_1]);
|
||||
p_cb->at_0x00[param_1] = NULL;
|
||||
p_cb->at_0x1a[param_1] = 4;
|
||||
|
||||
BT_TRACE(HCI, ERROR,
|
||||
"HCIS: Invalid length for incoming HCI message.");
|
||||
@@ -242,85 +242,85 @@ UINT16 hcisu_h2_receive_msg(UINT16 pipe, tHCISU_H2_CB *p_cb)
|
||||
|
||||
if (msg_len != 0)
|
||||
{
|
||||
p_cb->at_0x1a[pipe] = 3;
|
||||
p_cb->at_0x1a[param_1] = 3;
|
||||
}
|
||||
else
|
||||
{
|
||||
msg_received = TRUE;
|
||||
p_cb->at_0x1a[pipe] = 0;
|
||||
p_cb->at_0x1a[param_1] = 0;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
p_cb->at_0x17[pipe] = byte;
|
||||
p_cb->at_0x17[param_1] = byte;
|
||||
}
|
||||
|
||||
break;
|
||||
|
||||
case 2:
|
||||
--p_cb->at_0x0c[pipe];
|
||||
--p_cb->at_0x0c[param_1];
|
||||
|
||||
if (p_cb->at_0x0c[pipe] == 0)
|
||||
if (p_cb->at_0x0c[param_1] == 0)
|
||||
{
|
||||
msg_len = byte;
|
||||
|
||||
if (p_cb->at_0x14[pipe] == 2)
|
||||
msg_len = (msg_len << 8) + p_cb->at_0x17[pipe];
|
||||
if (p_cb->at_0x14[param_1] == 2)
|
||||
msg_len = (msg_len << 8) + p_cb->at_0x17[param_1];
|
||||
|
||||
p_cb->at_0x0c[pipe] = msg_len;
|
||||
p_cb->at_0x1a[pipe] = 4;
|
||||
p_cb->at_0x0c[param_1] = msg_len;
|
||||
p_cb->at_0x1a[param_1] = 4;
|
||||
}
|
||||
else
|
||||
{
|
||||
p_cb->at_0x17[pipe] = byte;
|
||||
p_cb->at_0x17[param_1] = byte;
|
||||
}
|
||||
|
||||
break;
|
||||
|
||||
case 3:
|
||||
*((UINT8 *)(p_cb->at_0x00[pipe] + 1)
|
||||
+ p_cb->at_0x00[pipe]->len++) = byte;
|
||||
*((UINT8 *)(p_cb->at_0x00[param_1] + 1)
|
||||
+ p_cb->at_0x00[param_1]->len++) = byte;
|
||||
|
||||
--p_cb->at_0x0c[pipe];
|
||||
--p_cb->at_0x0c[param_1];
|
||||
|
||||
len = UUSB_Read(pipe + 1,
|
||||
(UINT8 *)(p_cb->at_0x00[pipe] + 1)
|
||||
+ p_cb->at_0x00[pipe]->len,
|
||||
p_cb->at_0x0c[pipe]);
|
||||
len = UUSB_Read(param_1 + 1,
|
||||
(UINT8 *)(p_cb->at_0x00[param_1] + 1)
|
||||
+ p_cb->at_0x00[param_1]->len,
|
||||
p_cb->at_0x0c[param_1]);
|
||||
|
||||
p_cb->at_0x00[pipe]->len += len;
|
||||
p_cb->at_0x0c[pipe] -= len;
|
||||
p_cb->at_0x00[param_1]->len += len;
|
||||
p_cb->at_0x0c[param_1] -= len;
|
||||
bytes_read += len;
|
||||
|
||||
if (p_cb->at_0x0c[pipe] == 0)
|
||||
if (p_cb->at_0x0c[param_1] == 0)
|
||||
{
|
||||
if (p_cb->at_0x14[pipe] == 2
|
||||
if (p_cb->at_0x14[param_1] == 2
|
||||
&& l2cap_link_chk_pkt_end() == 0)
|
||||
{
|
||||
p_cb->at_0x1a[pipe] = 0;
|
||||
p_cb->at_0x1a[param_1] = 0;
|
||||
}
|
||||
else
|
||||
{
|
||||
msg_received = TRUE;
|
||||
p_cb->at_0x1a[pipe] = 0;
|
||||
p_cb->at_0x1a[param_1] = 0;
|
||||
}
|
||||
}
|
||||
|
||||
break;
|
||||
|
||||
case 4:
|
||||
--p_cb->at_0x0c[pipe];
|
||||
--p_cb->at_0x0c[param_1];
|
||||
|
||||
if (p_cb->at_0x0c[pipe] == 0)
|
||||
p_cb->at_0x1a[pipe] = 0;
|
||||
if (p_cb->at_0x0c[param_1] == 0)
|
||||
p_cb->at_0x1a[param_1] = 0;
|
||||
|
||||
break;
|
||||
}
|
||||
|
||||
if (msg_received)
|
||||
{
|
||||
GKI_send_msg(hcisu_h2_cb.at_0x1f, 0, p_cb->at_0x00[pipe]);
|
||||
p_cb->at_0x00[pipe] = NULL;
|
||||
GKI_send_msg(hcisu_h2_cb.at_0x1f, 0, p_cb->at_0x00[param_1]);
|
||||
p_cb->at_0x00[param_1] = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -403,7 +403,7 @@ void hcisu_h2_send_msg(tHCISU_H2_CB *p_cb, HC_BT_HDR *p_msg)
|
||||
hcisu_h2_send_msg_now(p_cb, p_msg);
|
||||
}
|
||||
|
||||
void hcisu_h2_init(UINT8 taskId, UINT8 mbox, UINT16 bufSize)
|
||||
void hcisu_h2_init(UINT8 param_1, UINT8 param_2, UINT16 param_3)
|
||||
{
|
||||
hcisu_h2_cb.at_0x1e = 0;
|
||||
|
||||
@@ -411,9 +411,9 @@ void hcisu_h2_init(UINT8 taskId, UINT8 mbox, UINT16 bufSize)
|
||||
hcisu_h2_cb.at_0x1a[1] = 0;
|
||||
hcisu_h2_cb.at_0x1a[2] = 0;
|
||||
|
||||
hcisu_h2_cb.at_0x1f = taskId;
|
||||
hcisu_h2_cb.at_0x20 = mbox;
|
||||
hcisu_h2_cb.at_0x12 = bufSize;
|
||||
hcisu_h2_cb.at_0x1f = param_1;
|
||||
hcisu_h2_cb.at_0x20 = param_2;
|
||||
hcisu_h2_cb.at_0x12 = param_3;
|
||||
}
|
||||
|
||||
BOOLEAN hcisu_h2_open(tHCI_CFG *_p_cfg)
|
||||
|
||||
@@ -478,7 +478,7 @@ BOOLEAN L2CA_SetAclPriority(BD_ADDR bd_addr, UINT8 priority)
|
||||
}
|
||||
|
||||
void L2CA_SetCompression(UINT16 local_cid, UINT8 pe_type, UINT8 mem_level,
|
||||
UINT8 wbits, UINT8 direction, UINT8 config,
|
||||
UINT8 wbits, UINT8 direction, UINT8 param_6,
|
||||
UINT8 enable)
|
||||
{
|
||||
tL2C_LCB *p_lcb;
|
||||
@@ -506,7 +506,7 @@ void L2CA_SetCompression(UINT16 local_cid, UINT8 pe_type, UINT8 mem_level,
|
||||
}
|
||||
}
|
||||
|
||||
void L2CA_RegisterCompression(tL2CA_COMPRESS_CB *p_callback, int unused)
|
||||
void L2CA_RegisterCompression(tL2CA_COMPRESS_CB *param_1, int param_2)
|
||||
{
|
||||
#if 0
|
||||
/* ... */
|
||||
|
||||
@@ -565,7 +565,7 @@ void UUSB_Open(tUUSB *uusb, tUUSB_CBACK *cback)
|
||||
(void)uusb;
|
||||
}
|
||||
|
||||
UINT16 UUSB_Read(UINT8 pipe, void *buf, UINT16 len)
|
||||
UINT16 UUSB_Read(UINT8 param_1, void *param_2, UINT16 param_3)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
@@ -580,7 +580,7 @@ int UUSB_WriteBuf(/* ... */)
|
||||
return 0;
|
||||
}
|
||||
|
||||
UINT16 UUSB_Write(UINT8 pipe, void *p_data, UINT16 len, void *unused)
|
||||
UINT16 UUSB_Write(UINT8 param_1, void *p_data, UINT16 len, void *param_4)
|
||||
{
|
||||
short sp18 = 0;
|
||||
IOSError ret = 0;
|
||||
@@ -591,7 +591,7 @@ UINT16 UUSB_Write(UINT8 pipe, void *p_data, UINT16 len, void *unused)
|
||||
if (usb.state != 2)
|
||||
return 0;
|
||||
|
||||
switch (pipe)
|
||||
switch (param_1)
|
||||
{
|
||||
case 0:
|
||||
p_buf = GKI_getpoolbuf(usb.cmd_buffer_pool);
|
||||
@@ -656,7 +656,7 @@ UINT16 UUSB_Write(UINT8 pipe, void *p_data, UINT16 len, void *unused)
|
||||
memcpy(p_buffer, p_data, len);
|
||||
|
||||
if (len > 190)
|
||||
UUSBDBG(" woah ! thats pretty Big ! :%d", len);
|
||||
UUSBDBG(" woah ! thats pretty Big ! :%d", param_3);
|
||||
|
||||
if (usb.at_0x38 < 5 && usb.bulk_buffer_q.count == 0)
|
||||
{
|
||||
@@ -696,7 +696,7 @@ UINT16 UUSB_Write(UINT8 pipe, void *p_data, UINT16 len, void *unused)
|
||||
break;
|
||||
}
|
||||
|
||||
(void)unused;
|
||||
(void)param_4;
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
||||
char scCntCacheStrs[0xd0] = {
|
||||
char lbl_81693350[0xd0] = {
|
||||
0x3c, 0x3c, 0x20, 0x52, 0x56, 0x4c, 0x5f, 0x53, 0x44, 0x4b, 0x20, 0x2d, 0x20, 0x43, 0x4e, 0x54,
|
||||
0x43, 0x41, 0x43, 0x48, 0x45, 0x20, 0x09, 0x72, 0x65, 0x6c, 0x65, 0x61, 0x73, 0x65, 0x20, 0x62,
|
||||
0x75, 0x69, 0x6c, 0x64, 0x3a, 0x20, 0x41, 0x70, 0x72, 0x20, 0x32, 0x30, 0x20, 0x32, 0x30, 0x31,
|
||||
@@ -22,12 +22,12 @@ char scCntCacheStrs[0xd0] = {
|
||||
0x74, 0x20, 0x00, 0x00, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x54, 0x69, 0x74, 0x6c, 0x65, 0x00,
|
||||
0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x00, 0x00, 0x00
|
||||
};
|
||||
char scCntCacheTitleDataFmt[0x16] = {
|
||||
char lbl_81693420[0x16] = {
|
||||
0x2f, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x2f, 0x25, 0x30, 0x38, 0x78, 0x2f, 0x25, 0x30, 0x38, 0x78,
|
||||
0x2f, 0x64, 0x61, 0x74, 0x61, 0x00,
|
||||
};
|
||||
const char* __CNTCACHEVersion = scCntCacheStrs;
|
||||
char scCntCacheSpaceNl[3] = {0x20, 0x0a, 0x00};
|
||||
const char* __CNTCACHEVersion = lbl_81693350;
|
||||
char lbl_816985DC[3] = {0x20, 0x0a, 0x00};
|
||||
|
||||
extern void _savegpr_23();
|
||||
extern void _restgpr_23();
|
||||
@@ -72,9 +72,9 @@ asm void CNTCACHEClear() {
|
||||
mr r11, r12
|
||||
stw r0, 4(r12)
|
||||
bl _savegpr_23
|
||||
lis r30, scCntCacheStrs@ha
|
||||
lis r30, lbl_81693350@ha
|
||||
lis r3, _CNTCACHEMutex@ha
|
||||
addi r30, r30, scCntCacheStrs@l
|
||||
addi r30, r30, lbl_81693350@l
|
||||
li r29, 0
|
||||
addi r3, r3, _CNTCACHEMutex@l
|
||||
bl OSLockMutex
|
||||
@@ -146,7 +146,7 @@ L_184:
|
||||
stb r31, 0(r4)
|
||||
subf r23, r24, r4
|
||||
mr r3, r24
|
||||
la r4, scCntCacheSpaceNl
|
||||
la r4, lbl_816985DC
|
||||
bl strtok
|
||||
cmpwi r3, 0
|
||||
mr r29, r3
|
||||
@@ -246,7 +246,7 @@ asm void _CNTCACHEDeleteTitle() {
|
||||
stwu r1, -0x20(r1)
|
||||
mflr r0
|
||||
li r3, 0
|
||||
la r4, scCntCacheSpaceNl
|
||||
la r4, lbl_816985DC
|
||||
stw r0, 0x24(r1)
|
||||
stw r31, 0x1c(r1)
|
||||
stw r30, 0x18(r1)
|
||||
@@ -284,7 +284,7 @@ L_350:
|
||||
bl ES_DeleteTitleContent
|
||||
L_364:
|
||||
li r3, 0
|
||||
la r4, scCntCacheSpaceNl
|
||||
la r4, lbl_816985DC
|
||||
bl strtok
|
||||
L_370:
|
||||
cmpwi r3, 0
|
||||
@@ -305,10 +305,10 @@ asm int _CNTCACHEIsTitleRemovable(ESTitleId titleId) {
|
||||
subfic r11, r11, -0x2100
|
||||
stwux r1, r1, r11
|
||||
mflr r0
|
||||
lis r5, scCntCacheTitleDataFmt@ha
|
||||
lis r5, lbl_81693420@ha
|
||||
stw r0, 4(r12)
|
||||
li r0, 1
|
||||
addi r5, r5, scCntCacheTitleDataFmt@l
|
||||
addi r5, r5, lbl_81693420@l
|
||||
stw r31, -4(r12)
|
||||
stw r30, -8(r12)
|
||||
mr r30, r3
|
||||
@@ -403,7 +403,7 @@ asm void _CNTCACHEDeleteContent() {
|
||||
stw r0, 4(r12)
|
||||
bl _savegpr_26
|
||||
li r3, 0
|
||||
la r4, scCntCacheSpaceNl
|
||||
la r4, lbl_816985DC
|
||||
bl strtok
|
||||
li r31, 0
|
||||
li r4, 0
|
||||
@@ -441,10 +441,10 @@ asm void _CNTCACHEDeleteContent() {
|
||||
rlwinm. r0, r3, 0, 0x1b, 0x1b
|
||||
beq L_6f0
|
||||
li r3, 0
|
||||
la r4, scCntCacheSpaceNl
|
||||
la r4, lbl_816985DC
|
||||
bl strtok
|
||||
li r26, 1
|
||||
lis r27, scCntCacheTitleDataFmt@ha
|
||||
lis r27, lbl_81693420@ha
|
||||
b L_6e8
|
||||
L_5b0:
|
||||
stw r31, errno(r0)
|
||||
@@ -488,7 +488,7 @@ L_5e8:
|
||||
li r0, -1
|
||||
stw r26, 0x20(r1)
|
||||
addi r3, r1, 0x40
|
||||
addi r5, r27, scCntCacheTitleDataFmt@l
|
||||
addi r5, r27, lbl_81693420@l
|
||||
stw r26, 0x24(r1)
|
||||
and r6, r30, r0
|
||||
and r7, r29, r0
|
||||
@@ -529,7 +529,7 @@ L_6d4:
|
||||
bdnz L_5e8
|
||||
L_6dc:
|
||||
li r3, 0
|
||||
la r4, scCntCacheSpaceNl
|
||||
la r4, lbl_816985DC
|
||||
bl strtok
|
||||
L_6e8:
|
||||
cmpwi r3, 0
|
||||
|
||||
@@ -221,11 +221,11 @@ CXSecureResult CXSecureUncompressLZ(const void* src, u32 length, void* dst) {
|
||||
return CX_SECURE_ERR_OK;
|
||||
}
|
||||
|
||||
BOOL CXiVerifyHuffmanTable_(const void* table, u8 bitSize) {
|
||||
const u8* a = table;
|
||||
BOOL CXiVerifyHuffmanTable_(const void* param_1, u8 param_2) {
|
||||
const u8* a = param_1;
|
||||
const u8* b = a + 1;
|
||||
u32 c = *a;
|
||||
const u8* d = (u8*)table + ((c + 1) << 1);
|
||||
const u8* d = (u8*)param_1 + ((c + 1) << 1);
|
||||
|
||||
u8 e[sizeof(u8) * 0x40];
|
||||
u32 i;
|
||||
@@ -233,7 +233,7 @@ BOOL CXiVerifyHuffmanTable_(const void* table, u8 bitSize) {
|
||||
e[i] = 0;
|
||||
}
|
||||
|
||||
if (bitSize == 4 && c >= 16) {
|
||||
if (param_2 == 4 && c >= 16) {
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
|
||||
@@ -4,8 +4,8 @@
|
||||
static inline int CXiReadHeader(u8*, int*, const u8*, int, int);
|
||||
static inline CXHuffmanDecodeTableEntry* GetNextNode(CXHuffmanDecodeTableEntry*, int);
|
||||
|
||||
void CXInitUncompContextRL(CXUncompContextRL* context, u8* data) {
|
||||
context->unk_0x00 = data;
|
||||
void CXInitUncompContextRL(CXUncompContextRL* context, u8* param_2) {
|
||||
context->unk_0x00 = param_2;
|
||||
context->unk_0x04 = 0;
|
||||
context->unk_0x0e = 0;
|
||||
context->unk_0x0C = 0;
|
||||
@@ -13,8 +13,8 @@ void CXInitUncompContextRL(CXUncompContextRL* context, u8* data) {
|
||||
context->size = 0;
|
||||
}
|
||||
|
||||
void CXInitUncompContextLZ(CXUncompContextLZ* context, u8* data) {
|
||||
context->unk_0x00 = data;
|
||||
void CXInitUncompContextLZ(CXUncompContextLZ* context, u8* param_2) {
|
||||
context->unk_0x00 = param_2;
|
||||
context->unk_0x04 = 0;
|
||||
context->unk_0x11 = 0;
|
||||
context->unk_0x12 = 0;
|
||||
@@ -125,7 +125,7 @@ CXStreamingResult CXReadUncompRL(CXUncompContextRL* context, const void* src, u3
|
||||
return CX_STREAMING_ERR_OK;
|
||||
}
|
||||
|
||||
static int CXiReadHeader(u8* pHdrLen, int* pOutLen, const u8* pSrc, int srcSize, int maxOutLen) {
|
||||
static int CXiReadHeader(u8* pHdrLen, int* pOutLen, const u8* pSrc, int srcSize, int param_5) {
|
||||
int bytesParsed = 0;
|
||||
|
||||
while (*pHdrLen) {
|
||||
@@ -150,8 +150,8 @@ static int CXiReadHeader(u8* pHdrLen, int* pOutLen, const u8* pSrc, int srcSize,
|
||||
}
|
||||
}
|
||||
|
||||
if (maxOutLen > 0 && maxOutLen < *pOutLen) {
|
||||
*pOutLen = maxOutLen;
|
||||
if (param_5 > 0 && param_5 < *pOutLen) {
|
||||
*pOutLen = param_5;
|
||||
}
|
||||
|
||||
return bytesParsed;
|
||||
|
||||
@@ -24,9 +24,16 @@ char NAND_Org_Path[64];
|
||||
NAND_DISK_INFO nanddisk_info[23];
|
||||
NAND_SEMAPHORE csem;
|
||||
NAND_SEMAPHORE osem;
|
||||
s32 Nanddisk_Internal_Info_Init = 0;
|
||||
s32 NAND_Init = 0;
|
||||
s32 fa_nanad_semid = 0;
|
||||
u32 fa_nanddrv_bss_tail[4];
|
||||
__declspec(export) u32 fa_nanddrv_work0;
|
||||
__declspec(export) u32 fa_nanddrv_work1;
|
||||
__declspec(export) u32 fa_nanddrv_work2;
|
||||
__declspec(export) u32 fa_nanddrv_work3;
|
||||
__declspec(export) u32 fa_nanddrv_work4;
|
||||
s32 fa_nanad_semid;
|
||||
s32 NAND_Init;
|
||||
s32 Nanddisk_Internal_Info_Init;
|
||||
|
||||
|
||||
static inline s32 find_disk(PDM_DISK* disk, NAND_DISK_INFO** result) {
|
||||
NAND_DISK_INFO* info;
|
||||
@@ -164,14 +171,16 @@ static s32 fa_nanddrv_ParseCreateNANDFile(NAND_DISK_INFO* info) {
|
||||
return error;
|
||||
}
|
||||
if (length > 11) { return -20; }
|
||||
if (pf_strcmp(name, "..") != 0) { error = NANDCreateDir(name, 0x30, 0); }
|
||||
if (pf_strcmp(name, "..\0") != 0) { error = NANDCreateDir(name, 0x30, 0); }
|
||||
else { error = 0; }
|
||||
if (error == 0 || error == -6 || error == -1) {
|
||||
error = NANDChangeDir(name);
|
||||
if (error != 0) { return error; }
|
||||
else { goto success; }
|
||||
} else {
|
||||
return error;
|
||||
}
|
||||
success:
|
||||
path++;
|
||||
pf_memset(name, 0, 16);
|
||||
next = name;
|
||||
@@ -194,6 +203,7 @@ static s32 fa_nanddrv_ParseCreateNANDFile(NAND_DISK_INFO* info) {
|
||||
}
|
||||
}
|
||||
static s32 fa_nanddrv_VerifyBPB(u8* buf, u32* clusters) {
|
||||
|
||||
u8 sector_log = 0;
|
||||
u8 cluster_log;
|
||||
u16 value = 512;
|
||||
@@ -405,7 +415,6 @@ s32 fa_nanddrv_init_drv_tbl(PDM_DISK_TBL* table, u32 extension) {
|
||||
}
|
||||
s32 fa_nanddrv_NotifyNANDFile(const char* path, u32 size) {
|
||||
u16 index;
|
||||
|
||||
if (pf_strlen(path) >= 76) { return -20; }
|
||||
if (Nanddisk_Internal_Info_Init == 0) {
|
||||
pf_memset(nanddisk_info, 0, sizeof(nanddisk_info));
|
||||
@@ -484,12 +493,12 @@ static s32 fa_nanddrv_physical_write(u32 count, const u8* buf, u32 block, u32 bp
|
||||
u32 file_size;
|
||||
u32 wanted;
|
||||
u32 remaining;
|
||||
s32 error;
|
||||
u16 index;
|
||||
u32 offset;
|
||||
u32 position;
|
||||
s32 error;
|
||||
u8 work[512] __attribute__((aligned(32)));
|
||||
NAND_DISK_INFO* info = 0;
|
||||
u8 work[512] __attribute__((aligned(32)));
|
||||
for (index = 0; index < 23; index++) {
|
||||
if (nanddisk_info[index].disk == disk) { info = &nanddisk_info[index]; break; }
|
||||
}
|
||||
@@ -533,3 +542,4 @@ static s32 fa_nanddrv_physical_write(u32 count, const u8* buf, u32 block, u32 bp
|
||||
store_disk_error(disk, error);
|
||||
return error;
|
||||
}
|
||||
|
||||
|
||||
@@ -6,11 +6,11 @@ extern pf_s32 pdm_part_is_attached_partition(PDM_PARTITION* partition);
|
||||
|
||||
pf_u8 pfd_get_media_drv_char(PDM_DISK* disk, pf_s8* drives, pf_u32 capacity) {
|
||||
pf_u32 partition_index;
|
||||
pf_u32 volume_index;
|
||||
PF_VOLUME* volume;
|
||||
pf_u8 count;
|
||||
pf_s8* next_drive;
|
||||
PDM_PARTITION* partition;
|
||||
pf_u16 volume_index;
|
||||
PF_VOLUME* volume;
|
||||
if (drives == NULL || capacity == 0) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -1,16 +1,16 @@
|
||||
#include <stddef.h>
|
||||
#include <revolution/fa/types.h>
|
||||
#include <revolution/os.h>
|
||||
#include <revolution/sdi.h>
|
||||
|
||||
typedef struct PFD_SDDRV_INFO {
|
||||
u32 flags;
|
||||
volatile u32 flags;
|
||||
u32 bytes_per_sector;
|
||||
SDDev* device;
|
||||
SDDev* volatile device;
|
||||
FADisk* disk;
|
||||
u32 media_inserted;
|
||||
volatile u32 media_inserted;
|
||||
u32 media_ejected;
|
||||
s8 drive;
|
||||
u32 reserved;
|
||||
} PFD_SDDRV_INFO;
|
||||
|
||||
typedef union PFD_SDDEV_STORAGE {
|
||||
@@ -33,9 +33,16 @@ PFD_SDDRV_INFO g_pfd_sddrv_info;
|
||||
PFD_SDDEV_STORAGE g_pfd_sddev;
|
||||
u8 g_pfd_sddrv_buf[0x200];
|
||||
|
||||
static FAInsertCallback g_attach_func = 0;
|
||||
static FAEjectCallback g_detach_func = 0;
|
||||
u32 pfd_sddrv_reserved;
|
||||
u32 g_event;
|
||||
u32 pfd_sddrv_work0;
|
||||
u32 pfd_sddrv_work1;
|
||||
u32 pfd_sddrv_work2;
|
||||
u32 pfd_sddrv_work3;
|
||||
u32 pfd_sddrv_work4;
|
||||
u32 pfd_sddrv_work5;
|
||||
static FAEjectCallback g_detach_func;
|
||||
static FAInsertCallback g_attach_func;
|
||||
|
||||
extern u8 pfd_get_media_drv_char(FADisk*, s8*, u32);
|
||||
extern void pdm_disk_notify_media_insert(FADisk*);
|
||||
@@ -136,17 +143,17 @@ typedef union PFD_SDDRV_U16_BYTES {
|
||||
u8 bytes[2];
|
||||
} PFD_SDDRV_U16_BYTES;
|
||||
|
||||
#define pfd_sddrv_store_le16(buffer, field, offset, value) \
|
||||
#define pfd_sddrv_store_le16(field, value) \
|
||||
do { \
|
||||
if (((u32)(field) & 1) != 0) { \
|
||||
(field)[0] = (u8)(value); \
|
||||
(field)[1] = (u8)((value) >> 8); \
|
||||
} else { \
|
||||
((u16*)(buffer))[(offset) / 2 + (offset) % 2] = (((value) & 0xff) << 8) | (((value) & 0xff00) >> 8); \
|
||||
*(u16*)(field) = (((value) & 0xff) << 8) | (((value) & 0xff00) >> 8); \
|
||||
} \
|
||||
} while (0)
|
||||
|
||||
#define pfd_sddrv_store_le32(buffer, field, offset, value) \
|
||||
#define pfd_sddrv_store_le32(field, value) \
|
||||
do { \
|
||||
if (((u32)(field) & 3) != 0) { \
|
||||
(field)[0] = (u8)(value); \
|
||||
@@ -154,7 +161,7 @@ typedef union PFD_SDDRV_U16_BYTES {
|
||||
(field)[2] = (u8)((value) >> 16); \
|
||||
(field)[3] = (u8)((value) >> 24); \
|
||||
} else { \
|
||||
((u32*)(buffer))[(offset) / 4 + (offset) % 4] = (((value) & 0xff) << 24 | ((value) & 0xff00) << 8) | \
|
||||
*(u32*)(field) = (((value) & 0xff) << 24 | ((value) & 0xff00) << 8) | \
|
||||
(((value) & 0xff000000) >> 24 | ((value) & 0xff0000) >> 8); \
|
||||
} \
|
||||
} while (0)
|
||||
@@ -234,49 +241,33 @@ const PFD_SDDRV_SIZE_DEPEND sddrv_size_depend_tbl[14] = {
|
||||
|
||||
static inline void update_media_drive(void) {
|
||||
s8 drive;
|
||||
if (g_pfd_sddrv_info.drive == 0 && pfd_get_media_drv_char(g_pfd_sddrv_info.disk, &drive, 1) == 1) {
|
||||
if (g_pfd_sddrv_info.drive == 0 && pfd_get_media_drv_char(*(FADisk* volatile*)&g_pfd_sddrv_info.disk, &drive, 1) == 1) {
|
||||
g_pfd_sddrv_info.drive = drive;
|
||||
}
|
||||
}
|
||||
|
||||
static inline void clear_mount_flag(void) {
|
||||
static void clear_mount_flag(void) {
|
||||
g_pfd_sddrv_info.flags &= ~2;
|
||||
}
|
||||
|
||||
static inline u32 pfd_sddrv_flags(const PFD_SDDRV_INFO* info) {
|
||||
return info->flags;
|
||||
}
|
||||
|
||||
static inline SDDev* pfd_sddrv_device(const PFD_SDDRV_INFO* info) {
|
||||
return info->device;
|
||||
}
|
||||
|
||||
static inline FADisk* pfd_sddrv_disk(const PFD_SDDRV_INFO* info) {
|
||||
return info->disk;
|
||||
}
|
||||
|
||||
static inline s8 pfd_sddrv_drive(const PFD_SDDRV_INFO* info) {
|
||||
return info->drive;
|
||||
}
|
||||
|
||||
s32 pfd_st_inter_callback(s32 status, void* data) {
|
||||
s32 result;
|
||||
|
||||
if ((status & 1) != 1) {
|
||||
return 0;
|
||||
}
|
||||
if (pfd_sddrv_device(&g_pfd_sddrv_info) != 0) {
|
||||
if (g_pfd_sddrv_info.device != 0) {
|
||||
g_event = 2;
|
||||
result = ISD_RegisterDeviceIntrHandler(g_pfd_sddrv_info.device, (SDDevIntrCallback)pfd_st_removal_callback, &g_event);
|
||||
if (result != 0) {
|
||||
OSReport("ERR:Failed to regist intr handler. pfd_st_inter_callback()\n");
|
||||
}
|
||||
}
|
||||
if (pfd_sddrv_disk(&g_pfd_sddrv_info) != 0) {
|
||||
if (g_pfd_sddrv_info.disk != 0) {
|
||||
update_media_drive();
|
||||
pdm_disk_notify_media_insert(g_pfd_sddrv_info.disk);
|
||||
if (pfd_sddrv_drive(&g_pfd_sddrv_info) != 0 && g_attach_func != 0) {
|
||||
g_attach_func(g_pfd_sddrv_info.drive);
|
||||
if (g_pfd_sddrv_info.drive != 0 && g_attach_func != 0) {
|
||||
g_attach_func(*(s8 volatile*)&g_pfd_sddrv_info.drive);
|
||||
}
|
||||
}
|
||||
g_pfd_sddrv_info.media_inserted = 1;
|
||||
@@ -291,18 +282,18 @@ s32 pfd_st_removal_callback(s32 status, void* data) {
|
||||
return 0;
|
||||
}
|
||||
g_pfd_sddrv_info.media_inserted = 0;
|
||||
if (g_pfd_sddrv_info.media_inserted == 0 && pfd_sddrv_device(&g_pfd_sddrv_info) != 0) {
|
||||
if (g_pfd_sddrv_info.device != 0) {
|
||||
g_event = 1;
|
||||
result = ISD_RegisterDeviceIntrHandler(g_pfd_sddrv_info.device, (SDDevIntrCallback)pfd_st_inter_callback, &g_event);
|
||||
if (result != 0) {
|
||||
OSReport("ERR:Failed to regist intr handler. pfd_st_removal_callback()\n");
|
||||
}
|
||||
}
|
||||
if (pfd_sddrv_disk(&g_pfd_sddrv_info) != 0) {
|
||||
if (g_pfd_sddrv_info.disk != 0) {
|
||||
update_media_drive();
|
||||
pdm_disk_notify_media_eject(g_pfd_sddrv_info.disk);
|
||||
if (pfd_sddrv_drive(&g_pfd_sddrv_info) != 0 && g_detach_func != 0) {
|
||||
g_detach_func(g_pfd_sddrv_info.drive);
|
||||
if (g_pfd_sddrv_info.drive != 0 && g_detach_func != 0) {
|
||||
g_detach_func(*(s8 volatile*)&g_pfd_sddrv_info.drive);
|
||||
}
|
||||
}
|
||||
return 0;
|
||||
@@ -313,15 +304,16 @@ s32 pfd_sddrv_init(FADisk* disk) {
|
||||
SDDev* device;
|
||||
u32 status;
|
||||
|
||||
if (disk == 0) {
|
||||
if (disk == (FADisk*)(status = 0)) {
|
||||
return -30;
|
||||
}
|
||||
if ((pfd_sddrv_flags(&g_pfd_sddrv_info) & 1) != 0) {
|
||||
if ((g_pfd_sddrv_info.flags & 1) != 0) {
|
||||
OSReport("INFO SD Card driver is already initialize. pfd_sddrv_init()\n");
|
||||
if (disk == g_pfd_sddrv_info.disk) {
|
||||
return 0;
|
||||
sd_result = 0;
|
||||
if (disk != g_pfd_sddrv_info.disk) {
|
||||
sd_result = -44;
|
||||
}
|
||||
return -44;
|
||||
return sd_result;
|
||||
}
|
||||
if ((g_pfd_sddrv_info.flags & 4) == 0) {
|
||||
g_pfd_sddrv_info.bytes_per_sector = 0x200;
|
||||
@@ -368,7 +360,7 @@ s32 pfd_sddrv_init(FADisk* disk) {
|
||||
return -42;
|
||||
}
|
||||
}
|
||||
g_pfd_sddrv_info.disk = disk;
|
||||
*(FADisk* volatile*)&g_pfd_sddrv_info.disk = disk;
|
||||
g_pfd_sddrv_info.flags |= 1;
|
||||
return 0;
|
||||
}
|
||||
@@ -473,22 +465,21 @@ s32 pfd_sddrv_unmount(FADisk* disk) {
|
||||
if (disk == 0) {
|
||||
return -30;
|
||||
}
|
||||
if ((pfd_sddrv_flags(&g_pfd_sddrv_info) & 2) != 0) {
|
||||
if ((g_pfd_sddrv_info.flags & 2) != 0) {
|
||||
clear_mount_flag();
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
s32 pfd_sddrv_finalize(FADisk* disk) {
|
||||
s32 result;
|
||||
|
||||
if (disk == 0) {
|
||||
return -30;
|
||||
}
|
||||
if ((pfd_sddrv_flags(&g_pfd_sddrv_info) & 2) != 0) {
|
||||
if ((g_pfd_sddrv_info.flags & 2) != 0) {
|
||||
clear_mount_flag();
|
||||
}
|
||||
if ((g_pfd_sddrv_info.flags & 1) != 0) {
|
||||
s32 result;
|
||||
result = ISD_UnregisterDeviceIntrHandler(g_pfd_sddrv_info.device);
|
||||
if (result != 0) {
|
||||
OSReport("WARNING Faild to UnregisterDeviceIntrHandler sd card [ret = %d]\n", result);
|
||||
@@ -499,10 +490,10 @@ s32 pfd_sddrv_finalize(FADisk* disk) {
|
||||
}
|
||||
g_pfd_sddrv_info.device = 0;
|
||||
}
|
||||
g_pfd_sddrv_info.flags = g_pfd_sddrv_info.flags & 0xfffffffe;
|
||||
g_pfd_sddrv_info.flags = g_pfd_sddrv_info.flags & ~1;
|
||||
g_pfd_sddrv_info.media_inserted = 0;
|
||||
g_pfd_sddrv_info.disk = 0;
|
||||
g_pfd_sddrv_info.drive = 0;
|
||||
*(FADisk* volatile*)&g_pfd_sddrv_info.disk = 0;
|
||||
*(s8 volatile*)&g_pfd_sddrv_info.drive = 0;
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -574,7 +565,7 @@ s32 pfd_sddrv_is_media_insert(void) {
|
||||
s8 drive;
|
||||
|
||||
if ((g_pfd_sddrv_info.flags & 1) != 0) {
|
||||
if (g_pfd_sddrv_info.drive == 0 && pfd_get_media_drv_char(g_pfd_sddrv_info.disk, &drive, 1) == 1) {
|
||||
if (g_pfd_sddrv_info.drive == 0 && pfd_get_media_drv_char(*(FADisk* volatile*)&g_pfd_sddrv_info.disk, &drive, 1) == 1) {
|
||||
g_pfd_sddrv_info.drive = drive;
|
||||
}
|
||||
if (g_pfd_sddrv_info.media_inserted != 0) {
|
||||
@@ -590,8 +581,8 @@ s32 pfd_sddrv_is_media_insert(void) {
|
||||
}
|
||||
|
||||
static s32 pfd_sddrv_physical_read(u32 blocks, u8* buffer, u32 sector, u32 bytes_per_sector, u32* blocks_read) {
|
||||
u32 current_sector;
|
||||
s32 result;
|
||||
s32 current_sector;
|
||||
u32 completed;
|
||||
u8* current_buffer;
|
||||
if ((g_pfd_sddrv_info.flags & 2) == 0) {
|
||||
@@ -655,8 +646,8 @@ static s32 pfd_sddrv_physical_read(u32 blocks, u8* buffer, u32 sector, u32 bytes
|
||||
}
|
||||
|
||||
s32 pfd_sddrv_physical_write(u32 blocks, u8* buffer, u32 sector, u32 bytes_per_sector, u32* blocks_written) {
|
||||
u32 current_sector;
|
||||
s32 result;
|
||||
s32 current_sector;
|
||||
u32 completed;
|
||||
u8* current_buffer;
|
||||
if ((g_pfd_sddrv_info.flags & 2) == 0) {
|
||||
@@ -748,8 +739,7 @@ s32 pfd_sddrv_get_total_sectors(u32* sectors, u16* bytes_per_sector) {
|
||||
multiplier = (csd[2] >> 8) & 0xf;
|
||||
minimum_multiplier = multiplier >= 9 ? multiplier : 9;
|
||||
max_multiplier = minimum_multiplier <= 11 ? minimum_multiplier : 11;
|
||||
multiplier_factor = 1;
|
||||
multiplier_factor <<= (u16)(max_multiplier - 9);
|
||||
multiplier_factor = (u16)1 << (u16)(max_multiplier - 9);
|
||||
*sectors = cluster_blocks * multiplier_factor;
|
||||
} else {
|
||||
*sectors = ((csd[1] >> 8 & 0x3fffff) + 1) * 0x400;
|
||||
@@ -758,27 +748,20 @@ s32 pfd_sddrv_get_total_sectors(u32* sectors, u16* bytes_per_sector) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
static inline u32 pfd_sddrv_encode_serial(s32 year, s32 month, s32 day, s32 hour, s32 minute, s32 second) {
|
||||
u32 date;
|
||||
u32 time;
|
||||
date = (day & 0x1f) | ((month & 0xf) << 5) | (((year - 1900) & 0x7f) << 9);
|
||||
time = (second & 0x1f) | ((minute & 0x3f) << 5) | ((hour & 0x1f) << 11);
|
||||
return (date << 16) + time;
|
||||
}
|
||||
|
||||
s32 pfd_sddrv_calc_mbr_bpb(PFD_SDDRV_FORMAT_DATA* format_data) {
|
||||
const PFD_SDDRV_SIZE_DEPEND* size_entry;
|
||||
PFD_SDDRV_SIZE_SETTINGS settings;
|
||||
u32 entry_index;
|
||||
u32 requested_sectors;
|
||||
const PFD_SDDRV_SIZE_DEPEND* size_entry;
|
||||
u32 current_start;
|
||||
u32 reserved_sectors;
|
||||
u32 total_sectors;
|
||||
u32 fat_sectors;
|
||||
u32 fat_entry_bits;
|
||||
u32 fat_sectors;
|
||||
u32 next_fat_sectors;
|
||||
u32 total_sectors;
|
||||
u8 sectors_per_cluster;
|
||||
u32 reserved_sectors;
|
||||
u32 fixed_sectors;
|
||||
u32 start_sector;
|
||||
u32 next_fat_sectors;
|
||||
u32 current_start;
|
||||
u32 clusters;
|
||||
u32 candidate_fat_sectors;
|
||||
u32 reserve_count;
|
||||
@@ -806,9 +789,10 @@ s32 pfd_sddrv_calc_mbr_bpb(PFD_SDDRV_FORMAT_DATA* format_data) {
|
||||
OSReport("ERR Failed to get values with total sectors. pfd_sddrv_get_value_with_total_sectors()\n");
|
||||
return result;
|
||||
}
|
||||
format_data->sectors_per_cluster = settings.sectors_per_cluster;
|
||||
sectors_per_cluster = settings.sectors_per_cluster;
|
||||
format_data->sectors_per_cluster = sectors_per_cluster;
|
||||
total_sectors = format_data->total_sectors;
|
||||
clusters = total_sectors / format_data->sectors_per_cluster;
|
||||
clusters = total_sectors / sectors_per_cluster;
|
||||
if (clusters < 0x1005) {
|
||||
fat_entry_bits = 12;
|
||||
} else if (clusters < 0xfff5) {
|
||||
@@ -816,7 +800,7 @@ s32 pfd_sddrv_calc_mbr_bpb(PFD_SDDRV_FORMAT_DATA* format_data) {
|
||||
} else {
|
||||
return -31;
|
||||
}
|
||||
if (total_sectors % format_data->sectors_per_cluster != 0) {
|
||||
if (total_sectors % sectors_per_cluster != 0) {
|
||||
clusters++;
|
||||
}
|
||||
candidate_fat_sectors = clusters * fat_entry_bits;
|
||||
@@ -843,7 +827,7 @@ s32 pfd_sddrv_calc_mbr_bpb(PFD_SDDRV_FORMAT_DATA* format_data) {
|
||||
start_sector += reserved_sectors;
|
||||
}
|
||||
moved_start = 0;
|
||||
clusters = (total_sectors - start_sector - fixed_sectors) / format_data->sectors_per_cluster + 1;
|
||||
clusters = (total_sectors - start_sector - fixed_sectors) / sectors_per_cluster + 1;
|
||||
if (clusters >= 0xfe5 && clusters < 0x1005) {
|
||||
current_start += reserved_sectors;
|
||||
start_sector = current_start - fixed_sectors;
|
||||
@@ -868,7 +852,7 @@ s32 pfd_sddrv_calc_mbr_bpb(PFD_SDDRV_FORMAT_DATA* format_data) {
|
||||
format_data->sectors_per_fat = fat_sectors;
|
||||
format_data->partition_start_sector = start_sector;
|
||||
format_data->partition_sector_count = format_data->total_sectors - start_sector;
|
||||
clusters = (format_data->partition_sector_count - (format_data->sectors_per_fat * 2 + 0x21)) / format_data->sectors_per_cluster + 1;
|
||||
clusters = (format_data->partition_sector_count - (next_fat_sectors * 2 + 0x21)) / format_data->sectors_per_cluster + 1;
|
||||
if (clusters < 0xff5) {
|
||||
format_data->fat_type = 0;
|
||||
} else if (clusters >= 0xff5) {
|
||||
@@ -877,18 +861,22 @@ s32 pfd_sddrv_calc_mbr_bpb(PFD_SDDRV_FORMAT_DATA* format_data) {
|
||||
return -31;
|
||||
}
|
||||
OSTicksToCalendarTime(OSGetTime(), ¤t_time);
|
||||
format_data->volume_serial_number = pfd_sddrv_encode_serial(current_time.year, current_time.mon, current_time.mday,
|
||||
current_time.hour, current_time.min, current_time.sec);
|
||||
format_data->volume_serial_number = ((current_time.mday & 0x1f) |
|
||||
((current_time.mon & 0xf) << 5) |
|
||||
(((current_time.year - 1900) & 0x7f) << 9)) * 0x10000 +
|
||||
((current_time.sec & 0x1f) |
|
||||
((current_time.min & 0x3f) << 5) |
|
||||
((current_time.hour & 0x1f) << 11));
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
s32 pfd_sddrv_store_bpb_buf(PFD_SDDRV_FORMAT_DATA* format_data, u8* sector_buffer) {
|
||||
const PFD_SDDRV_SIZE_DEPEND* size_entry;
|
||||
PFD_SDDRV_SIZE_SETTINGS settings;
|
||||
PFD_SDDRV_BPB* boot_sector;
|
||||
u32 entry_index;
|
||||
u32 requested_sectors;
|
||||
const PFD_SDDRV_SIZE_DEPEND* size_entry;
|
||||
u16 sectors_16;
|
||||
s32 result;
|
||||
u32 sectors_32;
|
||||
@@ -934,41 +922,42 @@ s32 pfd_sddrv_store_bpb_buf(PFD_SDDRV_FORMAT_DATA* format_data, u8* sector_buffe
|
||||
boot_sector->jump[0] = 0xeb;
|
||||
boot_sector->jump[1] = 0;
|
||||
boot_sector->jump[2] = 0x90;
|
||||
pfd_sddrv_store_le16(sector_buffer, boot_sector->bytes_per_sector, offsetof(PFD_SDDRV_BPB, bytes_per_sector), 0x200);
|
||||
pfd_sddrv_store_le16(boot_sector->bytes_per_sector, 0x200);
|
||||
boot_sector->sectors_per_cluster = format_data->sectors_per_cluster;
|
||||
pfd_sddrv_store_le16(sector_buffer, boot_sector->reserved_sector_count, offsetof(PFD_SDDRV_BPB, reserved_sector_count), 1);
|
||||
pfd_sddrv_store_le16(boot_sector->reserved_sector_count, 1);
|
||||
boot_sector->fat_count = 2;
|
||||
pfd_sddrv_store_le16(sector_buffer, boot_sector->root_entry_count, offsetof(PFD_SDDRV_BPB, root_entry_count), 0x200);
|
||||
pfd_sddrv_store_le16(sector_buffer, boot_sector->total_sectors_16, offsetof(PFD_SDDRV_BPB, total_sectors_16), (u16)sectors_16);
|
||||
pfd_sddrv_store_le16(boot_sector->root_entry_count, 0x200);
|
||||
pfd_sddrv_store_le16(boot_sector->total_sectors_16, (u16)sectors_16);
|
||||
boot_sector->media_descriptor = 0xf8;
|
||||
pfd_sddrv_store_le16(sector_buffer, boot_sector->sectors_per_fat_16, offsetof(PFD_SDDRV_BPB, sectors_per_fat_16), (u16)format_data->sectors_per_fat);
|
||||
pfd_sddrv_store_le16(sector_buffer, boot_sector->sectors_per_track, offsetof(PFD_SDDRV_BPB, sectors_per_track), (u16)settings.root_entries);
|
||||
pfd_sddrv_store_le16(sector_buffer, boot_sector->heads, offsetof(PFD_SDDRV_BPB, heads), (u16)settings.fat_copies);
|
||||
pfd_sddrv_store_le32(sector_buffer, boot_sector->hidden_sectors, offsetof(PFD_SDDRV_BPB, hidden_sectors), format_data->partition_start_sector);
|
||||
pfd_sddrv_store_le32(sector_buffer, boot_sector->total_sectors_32, offsetof(PFD_SDDRV_BPB, total_sectors_32), sectors_32);
|
||||
pfd_sddrv_store_le16(boot_sector->sectors_per_fat_16, (u16)format_data->sectors_per_fat);
|
||||
pfd_sddrv_store_le16(boot_sector->sectors_per_track, (u16)settings.root_entries);
|
||||
pfd_sddrv_store_le16(boot_sector->heads, (u16)settings.fat_copies);
|
||||
pfd_sddrv_store_le32(boot_sector->hidden_sectors, format_data->partition_start_sector);
|
||||
pfd_sddrv_store_le32(boot_sector->total_sectors_32, sectors_32);
|
||||
boot_sector->drive_number = 0x80;
|
||||
boot_sector->extended_signature = 0x29;
|
||||
pfd_sddrv_store_le32(sector_buffer, boot_sector->volume_serial_number, offsetof(PFD_SDDRV_BPB, volume_serial_number), format_data->volume_serial_number);
|
||||
pfd_sddrv_store_le32(boot_sector->volume_serial_number, format_data->volume_serial_number);
|
||||
boot_sector->signature[0] = 0x55;
|
||||
boot_sector->signature[1] = 0xaa;
|
||||
return 0;
|
||||
}
|
||||
|
||||
s32 pfd_sddrv_store_mbr_buf(PFD_SDDRV_FORMAT_DATA* format_data, u8* sector_buffer) {
|
||||
const PFD_SDDRV_SIZE_DEPEND* size_entry;
|
||||
PFD_SDDRV_SIZE_SETTINGS settings;
|
||||
PFD_SDDRV_MBR* master_boot_record;
|
||||
PFD_SDDRV_PARTITION_ENTRY* partition;
|
||||
u32 entry_index;
|
||||
u32 requested_sectors;
|
||||
const PFD_SDDRV_SIZE_DEPEND* size_entry;
|
||||
s32 result;
|
||||
u8 partition_type;
|
||||
u8 start_head;
|
||||
u16 start_sector;
|
||||
u16 start_cylinder;
|
||||
u8 end_head;
|
||||
u16 end_sector;
|
||||
u8 partition_type;
|
||||
u32 sectors_per_cylinder;
|
||||
u16 start_cylinder;
|
||||
u16 end_cylinder;
|
||||
u16 start_sector;
|
||||
u16 end_sector;
|
||||
|
||||
if (format_data == 0) {
|
||||
return -30;
|
||||
@@ -990,12 +979,13 @@ s32 pfd_sddrv_store_mbr_buf(PFD_SDDRV_FORMAT_DATA* format_data, u8* sector_buffe
|
||||
OSReport("ERR Failed to get values with total sectors. pfd_sddrv_get_value_with_total_sectors()\n");
|
||||
return result;
|
||||
}
|
||||
start_cylinder = format_data->partition_start_sector / (settings.fat_copies * settings.root_entries);
|
||||
start_head = (format_data->partition_start_sector % (settings.fat_copies * settings.root_entries)) / settings.root_entries;
|
||||
sectors_per_cylinder = settings.fat_copies * settings.root_entries;
|
||||
start_cylinder = format_data->partition_start_sector / sectors_per_cylinder;
|
||||
end_cylinder = (format_data->total_sectors - 1) / sectors_per_cylinder;
|
||||
start_sector = format_data->partition_start_sector % settings.root_entries + 1;
|
||||
end_cylinder = (format_data->total_sectors - 1) / (settings.fat_copies * settings.root_entries);
|
||||
end_head = ((format_data->total_sectors - 1) % (settings.fat_copies * settings.root_entries)) / settings.root_entries;
|
||||
end_sector = (format_data->total_sectors - 1) % settings.root_entries + 1;
|
||||
start_head = (format_data->partition_start_sector % sectors_per_cylinder) / settings.root_entries;
|
||||
end_head = ((format_data->total_sectors - 1) % sectors_per_cylinder) / settings.root_entries;
|
||||
if (format_data->partition_sector_count == 0) {
|
||||
return -30;
|
||||
}
|
||||
@@ -1011,14 +1001,14 @@ s32 pfd_sddrv_store_mbr_buf(PFD_SDDRV_FORMAT_DATA* format_data, u8* sector_buffe
|
||||
partition = &master_boot_record->partitions[0];
|
||||
partition->boot_indicator = 0;
|
||||
partition->start_head = start_head;
|
||||
pfd_sddrv_store_le16(sector_buffer, partition->start_sector_cylinder, offsetof(PFD_SDDRV_MBR, partitions) + offsetof(PFD_SDDRV_PARTITION_ENTRY, start_sector_cylinder),
|
||||
pfd_sddrv_store_le16(partition->start_sector_cylinder,
|
||||
((start_cylinder & 0xff) << 8) + ((start_sector & 0x3f) | ((start_cylinder & 0x300) >> 2)));
|
||||
partition->partition_type = partition_type;
|
||||
partition->end_head = end_head;
|
||||
pfd_sddrv_store_le16(sector_buffer, partition->end_sector_cylinder, offsetof(PFD_SDDRV_MBR, partitions) + offsetof(PFD_SDDRV_PARTITION_ENTRY, end_sector_cylinder),
|
||||
pfd_sddrv_store_le16(partition->end_sector_cylinder,
|
||||
((end_cylinder & 0xff) << 8) + ((end_sector & 0x3f) | ((end_cylinder & 0x300) >> 2)));
|
||||
pfd_sddrv_store_le32(sector_buffer, partition->first_sector, offsetof(PFD_SDDRV_MBR, partitions) + offsetof(PFD_SDDRV_PARTITION_ENTRY, first_sector), format_data->partition_start_sector);
|
||||
pfd_sddrv_store_le32(sector_buffer, partition->sector_count, offsetof(PFD_SDDRV_MBR, partitions) + offsetof(PFD_SDDRV_PARTITION_ENTRY, sector_count), format_data->partition_sector_count);
|
||||
pfd_sddrv_store_le32(partition->first_sector, format_data->partition_start_sector);
|
||||
pfd_sddrv_store_le32(partition->sector_count, format_data->partition_sector_count);
|
||||
master_boot_record->signature[0] = 0x55;
|
||||
master_boot_record->signature[1] = 0xaa;
|
||||
return 0;
|
||||
@@ -1073,9 +1063,8 @@ s32 pfd_sddrv_build_mbr_bpb(u32 total_sectors) {
|
||||
}
|
||||
|
||||
s32 pfd_sddrv_calc_fat32_mbr_bpb(PFD_SDDRV_FORMAT_DATA* format_data) {
|
||||
u8 sectors_per_cluster;
|
||||
u32 fat_sector_count;
|
||||
u32 available_sectors;
|
||||
u32 fat_sector_count;
|
||||
u32 fat_sectors;
|
||||
u32 cluster_count;
|
||||
u32 entry_index;
|
||||
@@ -1088,7 +1077,10 @@ s32 pfd_sddrv_calc_fat32_mbr_bpb(PFD_SDDRV_FORMAT_DATA* format_data) {
|
||||
u32 attempts;
|
||||
s32 result;
|
||||
u32 next_data_region;
|
||||
u32 date;
|
||||
u32 time;
|
||||
u32 total_sectors;
|
||||
u8 sectors_per_cluster;
|
||||
OSCalendarTime current_time;
|
||||
|
||||
if (format_data == 0) {
|
||||
@@ -1164,32 +1156,37 @@ s32 pfd_sddrv_calc_fat32_mbr_bpb(PFD_SDDRV_FORMAT_DATA* format_data) {
|
||||
format_data->sectors_per_fat = fat_sectors;
|
||||
format_data->reserved_sectors = reserved_sectors;
|
||||
format_data->partition_start_sector = 0x2000;
|
||||
format_data->partition_sector_count = format_data->total_sectors - 0x2000;
|
||||
format_data->partition_sector_count = total_sectors - 0x2000;
|
||||
OSTicksToCalendarTime(OSGetTime(), ¤t_time);
|
||||
format_data->volume_serial_number = pfd_sddrv_encode_serial(current_time.year, current_time.mon, current_time.mday,
|
||||
current_time.hour, current_time.min, current_time.sec);
|
||||
time = ((current_time.hour & 0x1f) << 11) |
|
||||
((current_time.min & 0x3f) << 5) |
|
||||
(current_time.sec & 0x1f);
|
||||
date = (((current_time.year - 1900) & 0x7f) << 9) |
|
||||
((current_time.mon & 0xf) << 5) |
|
||||
(current_time.mday & 0x1f);
|
||||
format_data->volume_serial_number = time + date * 0x10000;
|
||||
return 0;
|
||||
}
|
||||
|
||||
s32 pfd_sddrv_store_fat32_mbr_buf(PFD_SDDRV_FORMAT_DATA* format_data, u8* sector_buffer) {
|
||||
PFD_SDDRV_SIZE_SETTINGS settings;
|
||||
const PFD_SDDRV_SIZE_DEPEND* size_entry;
|
||||
PFD_SDDRV_MBR* master_boot_record;
|
||||
PFD_SDDRV_PARTITION_ENTRY* partition;
|
||||
u32 entry_index;
|
||||
u32 requested_sectors;
|
||||
const PFD_SDDRV_SIZE_DEPEND* size_entry;
|
||||
s32 result;
|
||||
u32 cylinder_size;
|
||||
u8 partition_type;
|
||||
u16 start_cylinder;
|
||||
u8 start_head;
|
||||
u16 start_sector;
|
||||
u16 start_cylinder;
|
||||
u16 end_cylinder;
|
||||
u8 end_head;
|
||||
u16 end_sector;
|
||||
u16 end_cylinder;
|
||||
u32 partition_end;
|
||||
u8 partition_type;
|
||||
|
||||
if (format_data == 0 || sector_buffer == 0) {
|
||||
if (format_data == 0) {
|
||||
return -30;
|
||||
}
|
||||
pf_memset(&settings, 0, 0x10);
|
||||
@@ -1209,42 +1206,42 @@ s32 pfd_sddrv_store_fat32_mbr_buf(PFD_SDDRV_FORMAT_DATA* format_data, u8* sector
|
||||
OSReport("ERR Failed to get values with total sectors. pfd_sddrv_get_value_with_total_sectors()\n");
|
||||
return result;
|
||||
}
|
||||
if (format_data->partition_start_sector > 0xfb0400) {
|
||||
cylinder_size = settings.fat_copies * settings.root_entries;
|
||||
partition_end = format_data->total_sectors - 1;
|
||||
partition_type = 0x0b;
|
||||
if (format_data->partition_start_sector <= 0xfb0400) {
|
||||
start_cylinder = format_data->partition_start_sector / cylinder_size;
|
||||
start_head = (format_data->partition_start_sector % cylinder_size) / settings.root_entries;
|
||||
start_sector = format_data->partition_start_sector % settings.root_entries + 1;
|
||||
} else {
|
||||
start_cylinder = 0x3ff;
|
||||
start_head = 0xfe;
|
||||
start_sector = 0x3f;
|
||||
start_cylinder = 0x3ff;
|
||||
} else {
|
||||
start_cylinder = format_data->partition_start_sector / (settings.fat_copies * settings.root_entries);
|
||||
start_head = (format_data->partition_start_sector % (settings.fat_copies * settings.root_entries)) / settings.root_entries;
|
||||
start_sector = format_data->partition_start_sector % settings.root_entries + 1;
|
||||
}
|
||||
if (format_data->total_sectors > 0xfb0400) {
|
||||
if (partition_end <= 0xfb0400) {
|
||||
end_cylinder = partition_end / cylinder_size;
|
||||
end_head = (partition_end % cylinder_size) / settings.root_entries;
|
||||
end_sector = partition_end % settings.root_entries + 1;
|
||||
} else {
|
||||
end_cylinder = 0x3ff;
|
||||
end_head = 0xfe;
|
||||
end_sector = 0x3f;
|
||||
end_cylinder = 0x3ff;
|
||||
partition_type = 0x0c;
|
||||
} else {
|
||||
partition_end = format_data->total_sectors - 1;
|
||||
partition_type = 0x0b;
|
||||
end_cylinder = partition_end / (settings.fat_copies * settings.root_entries);
|
||||
end_head = (partition_end % (settings.fat_copies * settings.root_entries)) / settings.root_entries;
|
||||
end_sector = partition_end % settings.root_entries + 1;
|
||||
}
|
||||
pf_memset(sector_buffer, 0, 0x200);
|
||||
master_boot_record = (PFD_SDDRV_MBR*)sector_buffer;
|
||||
partition = &master_boot_record->partitions[0];
|
||||
partition->boot_indicator = 0;
|
||||
partition->start_head = (u8)start_head;
|
||||
pfd_sddrv_store_le16(sector_buffer, partition->start_sector_cylinder, offsetof(PFD_SDDRV_MBR, partitions) + offsetof(PFD_SDDRV_PARTITION_ENTRY, start_sector_cylinder),
|
||||
pfd_sddrv_store_le16(partition->start_sector_cylinder,
|
||||
((start_cylinder & 0xff) << 8) + ((start_sector & 0x3f) | ((start_cylinder & 0x300) >> 2)));
|
||||
partition->partition_type = partition_type;
|
||||
partition->end_head = (u8)end_head;
|
||||
pfd_sddrv_store_le16(sector_buffer, partition->end_sector_cylinder, offsetof(PFD_SDDRV_MBR, partitions) + offsetof(PFD_SDDRV_PARTITION_ENTRY, end_sector_cylinder),
|
||||
pfd_sddrv_store_le16(partition->end_sector_cylinder,
|
||||
((end_cylinder & 0xff) << 8) + ((end_sector & 0x3f) | ((end_cylinder & 0x300) >> 2)));
|
||||
pfd_sddrv_store_le32(sector_buffer, partition->first_sector, offsetof(PFD_SDDRV_MBR, partitions) + offsetof(PFD_SDDRV_PARTITION_ENTRY, first_sector), format_data->partition_start_sector);
|
||||
pfd_sddrv_store_le32(sector_buffer, partition->sector_count, offsetof(PFD_SDDRV_MBR, partitions) + offsetof(PFD_SDDRV_PARTITION_ENTRY, sector_count), format_data->partition_sector_count);
|
||||
master_boot_record->signature[0] = 0x55;
|
||||
master_boot_record->signature[1] = 0xaa;
|
||||
pfd_sddrv_store_le32(partition->first_sector, format_data->partition_start_sector);
|
||||
pfd_sddrv_store_le32(partition->sector_count, format_data->partition_sector_count);
|
||||
pfd_sddrv_store_le16(master_boot_record->signature, 0xaa55);
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -1298,13 +1295,13 @@ s32 pfd_sddrv_store_fat32_fsi_buf(u8* sector_buffer) NO_INLINE {
|
||||
|
||||
s32 pfd_sddrv_store_fat32_bpb_buf(PFD_SDDRV_FORMAT_DATA* format_data, u8* sector_buffer) {
|
||||
PFD_SDDRV_SIZE_SETTINGS settings;
|
||||
const PFD_SDDRV_SIZE_DEPEND* size_entry;
|
||||
PFD_SDDRV_FAT32_BPB* boot_sector;
|
||||
u32 entry_index;
|
||||
u32 requested_sectors;
|
||||
const PFD_SDDRV_SIZE_DEPEND* size_entry;
|
||||
s32 result;
|
||||
|
||||
if (format_data == 0 || sector_buffer == 0) {
|
||||
if (format_data == 0) {
|
||||
return -30;
|
||||
}
|
||||
pf_memset(&settings, 0, 0x10);
|
||||
@@ -1332,29 +1329,33 @@ s32 pfd_sddrv_store_fat32_bpb_buf(PFD_SDDRV_FORMAT_DATA* format_data, u8* sector
|
||||
boot_sector->jump[0] = 0xeb;
|
||||
boot_sector->jump[1] = 0;
|
||||
boot_sector->jump[2] = 0x90;
|
||||
pfd_sddrv_store_le16(sector_buffer, boot_sector->bytes_per_sector, offsetof(PFD_SDDRV_FAT32_BPB, bytes_per_sector), 0x200);
|
||||
pfd_sddrv_store_le16(boot_sector->bytes_per_sector, 0x200);
|
||||
boot_sector->sectors_per_cluster = format_data->sectors_per_cluster;
|
||||
pfd_sddrv_store_le16(sector_buffer, boot_sector->reserved_sector_count, offsetof(PFD_SDDRV_FAT32_BPB, reserved_sector_count), format_data->reserved_sectors);
|
||||
pfd_sddrv_store_le16(boot_sector->reserved_sector_count, format_data->reserved_sectors);
|
||||
boot_sector->fat_count = 2;
|
||||
pfd_sddrv_store_le16(sector_buffer, boot_sector->root_entry_count, offsetof(PFD_SDDRV_FAT32_BPB, root_entry_count), 0);
|
||||
pfd_sddrv_store_le16(sector_buffer, boot_sector->total_sectors_16, offsetof(PFD_SDDRV_FAT32_BPB, total_sectors_16), 0);
|
||||
pfd_sddrv_store_le16(boot_sector->root_entry_count, 0);
|
||||
pfd_sddrv_store_le16(boot_sector->total_sectors_16, 0);
|
||||
boot_sector->media_descriptor = 0xf8;
|
||||
pfd_sddrv_store_le16(sector_buffer, boot_sector->sectors_per_fat_16, offsetof(PFD_SDDRV_FAT32_BPB, sectors_per_fat_16), 0);
|
||||
pfd_sddrv_store_le16(sector_buffer, boot_sector->sectors_per_track, offsetof(PFD_SDDRV_FAT32_BPB, sectors_per_track), (u16)settings.root_entries);
|
||||
pfd_sddrv_store_le16(sector_buffer, boot_sector->heads, offsetof(PFD_SDDRV_FAT32_BPB, heads), (u16)settings.fat_copies);
|
||||
pfd_sddrv_store_le32(sector_buffer, boot_sector->hidden_sectors, offsetof(PFD_SDDRV_FAT32_BPB, hidden_sectors), format_data->partition_start_sector);
|
||||
pfd_sddrv_store_le32(sector_buffer, boot_sector->total_sectors_32, offsetof(PFD_SDDRV_FAT32_BPB, total_sectors_32), format_data->partition_sector_count);
|
||||
pfd_sddrv_store_le32(sector_buffer, boot_sector->sectors_per_fat_32, offsetof(PFD_SDDRV_FAT32_BPB, sectors_per_fat_32), format_data->sectors_per_fat);
|
||||
pfd_sddrv_store_le16(sector_buffer, boot_sector->ext_flags, offsetof(PFD_SDDRV_FAT32_BPB, ext_flags), 0);
|
||||
pfd_sddrv_store_le16(sector_buffer, boot_sector->filesystem_version, offsetof(PFD_SDDRV_FAT32_BPB, filesystem_version), 0);
|
||||
pfd_sddrv_store_le32(sector_buffer, boot_sector->root_cluster, offsetof(PFD_SDDRV_FAT32_BPB, root_cluster), 2);
|
||||
pfd_sddrv_store_le16(sector_buffer, boot_sector->fsinfo_sector, offsetof(PFD_SDDRV_FAT32_BPB, fsinfo_sector), 1);
|
||||
pfd_sddrv_store_le16(sector_buffer, boot_sector->backup_boot_sector, offsetof(PFD_SDDRV_FAT32_BPB, backup_boot_sector), 6);
|
||||
pfd_sddrv_store_le16(boot_sector->sectors_per_fat_16, 0);
|
||||
pfd_sddrv_store_le16(boot_sector->sectors_per_track, (u16)settings.root_entries);
|
||||
pfd_sddrv_store_le16(boot_sector->heads, (u16)settings.fat_copies);
|
||||
pfd_sddrv_store_le32(boot_sector->hidden_sectors, format_data->partition_start_sector);
|
||||
pfd_sddrv_store_le32(boot_sector->total_sectors_32, format_data->partition_sector_count);
|
||||
pfd_sddrv_store_le32(boot_sector->sectors_per_fat_32, format_data->sectors_per_fat);
|
||||
pfd_sddrv_store_le16(boot_sector->ext_flags, 0);
|
||||
pfd_sddrv_store_le16(boot_sector->filesystem_version, 0);
|
||||
pfd_sddrv_store_le32(boot_sector->root_cluster, 2);
|
||||
pfd_sddrv_store_le16(boot_sector->fsinfo_sector, 1);
|
||||
pfd_sddrv_store_le16(boot_sector->backup_boot_sector, 6);
|
||||
boot_sector->drive_number = 0x80;
|
||||
boot_sector->extended_signature = 0x29;
|
||||
pfd_sddrv_store_le32(sector_buffer, boot_sector->volume_serial_number, offsetof(PFD_SDDRV_FAT32_BPB, volume_serial_number), format_data->volume_serial_number);
|
||||
boot_sector->signature[0] = 0x55;
|
||||
boot_sector->signature[1] = 0xaa;
|
||||
pfd_sddrv_store_le32(boot_sector->volume_serial_number, format_data->volume_serial_number);
|
||||
if (((u32)boot_sector->signature & 1) != 0) {
|
||||
boot_sector->signature[0] = 0x55;
|
||||
boot_sector->signature[1] = 0xaa;
|
||||
} else {
|
||||
*(u16*)boot_sector->signature = 0x55aa;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
#include <private/fa/puh_msc.h>
|
||||
|
||||
s32 uhg_msc_memid_8169971C;
|
||||
static s32 st_uhs_msc_tskid;
|
||||
static s32 st_uhs_msc_msgid;
|
||||
static s32 st_uhs_msc_status;
|
||||
static s32 st_uhs_msc_msgid;
|
||||
static s32 st_uhs_msc_tskid;
|
||||
s32 uhg_msc_memid_8169971C;
|
||||
static s32 _uhf_msc_api_send_message(UHF_MSC_PARAMETERS* parameters, u32 command);
|
||||
|
||||
s32 usbh_msc_read10(UHF_MSC_DEVICE* device, u32 sector, u16 count, void* buffer, void* sense) {
|
||||
|
||||
@@ -26,10 +26,11 @@ FAFuncTbl st_uhs_msc_blk_func = {
|
||||
};
|
||||
|
||||
static inline UHF_MSC_DEVICE* uhf_msc_blk_find_device(FADisk* disk) {
|
||||
UHF_MSC_DEVICE* entry = uhg_msc_blk_device_tbl;
|
||||
UHF_MSC_DEVICE* device = NULL;
|
||||
u32 index;
|
||||
for (index = 0; index < 8; index++) {
|
||||
if (uhg_msc_blk_device_tbl[index].disk == disk) {
|
||||
for (index = 0; index < 8; entry++, index++) {
|
||||
if (entry->disk == disk) {
|
||||
device = &uhg_msc_blk_device_tbl[index];
|
||||
break;
|
||||
}
|
||||
@@ -87,8 +88,9 @@ s32 uhf_msc_blk_mount(FADisk* disk) {
|
||||
}
|
||||
|
||||
s32 uhf_msc_blk_pread(FADisk* disk, u8* buffer, u32 sector, u32 blocks, u32* completed) {
|
||||
s32 error;
|
||||
u16 transfer_blocks;
|
||||
UHF_MSC_DEVICE* device;
|
||||
s32 error;
|
||||
u32 block_size;
|
||||
u8* transfer_buffer;
|
||||
u32 transfer_limit;
|
||||
@@ -127,7 +129,7 @@ s32 uhf_msc_blk_pread(FADisk* disk, u8* buffer, u32 sector, u32 blocks, u32* com
|
||||
transfer_buffer = buffer;
|
||||
}
|
||||
do {
|
||||
u16 transfer_blocks = transfer_limit;
|
||||
transfer_blocks = transfer_limit;
|
||||
if (blocks <= transfer_limit) {
|
||||
transfer_blocks = blocks;
|
||||
}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#include <private/fa/pdm.h>
|
||||
#include <revolution/types.h>
|
||||
#define MBR_WORD(buf, offset) (((pf_u32)(buf)[(offset) + 3] << 24) + ((pf_u32)(buf)[(offset) + 2] << 16) + ((pf_u32)(buf)[(offset) + 1] << 8) + (buf)[offset])
|
||||
#define MBR_WORD(buf, offset) (((pf_u32)(buf)[(offset) + 2] << 16) + (buf)[offset] + (((pf_u32)(buf)[(offset) + 3] << 24) + ((pf_u32)(buf)[(offset) + 1] << 8)))
|
||||
static inline pf_u16 read_boot_u16(pf_u8* buf, pf_u32 offset) {
|
||||
if ((pf_u32)&buf[offset] & 1) { return (buf[offset + 1] << 8) | buf[offset]; }
|
||||
return PF_SWAP_16(*(pf_u16*)&buf[(offset + 1) & ~1]);
|
||||
@@ -10,34 +10,24 @@ pf_s32 pdm_part_is_master_boot_sector(pf_u8* buf, pf_u32 total, pf_bool* p_is_mb
|
||||
pf_s16 index;
|
||||
pf_u32 start[4];
|
||||
pf_u32 count[4];
|
||||
pf_u32* p_start;
|
||||
pf_u32* p_count;
|
||||
*p_is_mbr = 0;
|
||||
if (buf[510] != 0x55 || buf[511] != 0xAA) { return 2; }
|
||||
p_start = start;
|
||||
p_count = count;
|
||||
for (index = 0; index < 4; index++) {
|
||||
*p_start = 0;
|
||||
*p_start = (((pf_u32)buf[456] << 16) + buf[454]) + (((pf_u32)buf[457] << 24) + ((pf_u32)buf[455] << 8));
|
||||
*p_count = (((pf_u32)buf[460] << 16) + buf[458]) + (((pf_u32)buf[461] << 24) + ((pf_u32)buf[459] << 8));
|
||||
if (*p_start != 0 && *p_count != 0) {
|
||||
start[index] = 0;
|
||||
start[index] = (((pf_u32)buf[456] << 16) + buf[454]) + (((pf_u32)buf[457] << 24) + ((pf_u32)buf[455] << 8));
|
||||
count[index] = (((pf_u32)buf[460] << 16) + buf[458]) + (((pf_u32)buf[461] << 24) + ((pf_u32)buf[459] << 8));
|
||||
if (start[index] != 0 && count[index] != 0) {
|
||||
if (index == 0) { *p_is_mbr = 1; }
|
||||
} else {
|
||||
if (index == 0) { return 2; }
|
||||
}
|
||||
p_start++;
|
||||
p_count++;
|
||||
buf += 16;
|
||||
}
|
||||
p_start = start;
|
||||
p_count = count;
|
||||
for (index = 0; index < 4; index++) {
|
||||
if (*p_start + *p_count > total) {
|
||||
if (start[index] + count[index] > total) {
|
||||
if (index == 0) { *p_is_mbr = 0; }
|
||||
return 2;
|
||||
}
|
||||
p_start++;
|
||||
p_count++;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
#define PF_FA_CP932_TABLE
|
||||
#define VFiPFCODE_CP932_OEM2Unicode PFCODE_CP932_OEM2Unicode
|
||||
#define VFiPFCODE_CP932_OEMCharWidth PFCODE_CP932_OEMCharWidth
|
||||
#define VFiPFCODE_CP932_Unicode2OEM PFCODE_CP932_Unicode2OEM
|
||||
|
||||
@@ -214,19 +214,21 @@ pf_s32 PFDIR_CheckDirIsEmpty(PF_ENT_ITER* iter, pf_u32* is_empty) {
|
||||
PFDIR_SDD* PFDIR_GetSDD(PF_VOLUME* volume, PF_DIR_ENT* entry) {
|
||||
PFDIR_VOLUME_DIRS* volume_dirs = (PFDIR_VOLUME_DIRS*)volume;
|
||||
PFDIR_SDD* first_free_sdd = 0;
|
||||
PFDIR_SDD* free_candidate = volume_dirs->sdds;
|
||||
pf_s32 i;
|
||||
pf_s32 remaining = 3;
|
||||
|
||||
for (i = 0; remaining != 0; remaining--) {
|
||||
if ((volume_dirs->sdds[i].stat & 1) == 0 || ((volume_dirs->sdds[i].stat & 1) != 0 && (!volume_dirs->sdds[i].stat & 2) != 0)) {
|
||||
if (first_free_sdd == 0) {
|
||||
first_free_sdd = &volume_dirs->sdds[i];
|
||||
first_free_sdd = free_candidate;
|
||||
}
|
||||
} else if (entry->p_vol == volume_dirs->sdds[i].dir_entry.p_vol &&
|
||||
entry->entry_sector == volume_dirs->sdds[i].dir_entry.entry_sector &&
|
||||
entry->entry_offset == volume_dirs->sdds[i].dir_entry.entry_offset) {
|
||||
return &volume_dirs->sdds[i];
|
||||
}
|
||||
free_candidate++;
|
||||
i++;
|
||||
}
|
||||
if (first_free_sdd == 0) {
|
||||
@@ -1070,7 +1072,7 @@ pf_s32 PFDIR_p_move(PF_VOLUME* volume, PF_STR* old_path, PF_STR* new_path) {
|
||||
|
||||
error = PFENT_ITER_GetEntryOfPath(&source_iter, &source_entry, volume, (PFDIR_STR*)old_path, 0);
|
||||
if (error != 0) { return error; }
|
||||
if (volume != PFPATH_GetVolumeFromPath(new_path)) { return 0x1F; }
|
||||
if (PFPATH_GetVolumeFromPath(new_path) != volume) { return 0x1F; }
|
||||
error = PFPATH_SplitPath((PFDIR_STR*)new_path, &directory, &destination_name);
|
||||
if (error != 0) { return error; }
|
||||
if (PFSTR_GetCodeMode(&destination_name) == 2) {
|
||||
|
||||
@@ -654,7 +654,7 @@ pf_s32 PFENT_MakeRootDir(PF_VOLUME* p_vol) {
|
||||
return 7;
|
||||
}
|
||||
{
|
||||
static pf_u8 default_volume_label[12] = "NO NAME ";
|
||||
static pf_u8 default_volume_label[16] = "NO NAME ";
|
||||
PFDRV_LoadVolumeLabelFromBuf(p_vol, default_volume_label);
|
||||
}
|
||||
return 0;
|
||||
|
||||
@@ -347,7 +347,7 @@ pf_s32 PFENT_ITER_DoGetEntry(PFITER_ENT_ITER* p_iter, PF_DIR_ENT* p_ent, PF_VOLU
|
||||
if (err != 0) {
|
||||
return err;
|
||||
}
|
||||
if (PFSTR_StrNumChar(p_path, 1) == 1 && (PFSTR_StrNCmp(p_path, (pf_s8*)"\0\0\0", 2, 0, 1) == 0)) {
|
||||
if (PFSTR_StrNumChar(p_path, 1) == 1 && (PFSTR_StrNCmp(p_path, (pf_s8*)"\0", 2, 0, 1) == 0)) {
|
||||
return 0;
|
||||
}
|
||||
} else {
|
||||
@@ -366,7 +366,7 @@ pf_s32 PFENT_ITER_DoGetEntry(PFITER_ENT_ITER* p_iter, PF_DIR_ENT* p_ent, PF_VOLU
|
||||
if (err != 0) {
|
||||
return err;
|
||||
}
|
||||
if (no_look_last_token != 0 && (PFSTR_StrNCmp(&token, (pf_s8*)"\0\0\0", 2, 0, 1) == 0)) {
|
||||
if (no_look_last_token != 0 && (PFSTR_StrNCmp(&token, (pf_s8*)"\0", 2, 0, 1) == 0)) {
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -424,7 +424,7 @@ pf_s32 PFENT_ITER_DoGetEntry(PFITER_ENT_ITER* p_iter, PF_DIR_ENT* p_ent, PF_VOLU
|
||||
}
|
||||
if ((p_ent->attr & 0x10) == 0 || p_ent->short_name[0] != '.') {
|
||||
p_ent->path_len = (PFSTR_StrNumChar(&token, 1) + 1) + p_ent->path_len;
|
||||
if ((PFSTR_StrNCmp(&token, (pf_s8*)"\0\0\0", 2, 0, 1) != 0)) {
|
||||
if ((PFSTR_StrNCmp(&token, (pf_s8*)"\0", 2, 0, 1) != 0)) {
|
||||
p_ent->path_len -= PFSTR_StrNumChar(&token, 2);
|
||||
}
|
||||
}
|
||||
@@ -689,7 +689,7 @@ pf_s32 PFENT_ITER_FindEntry(PFITER_ENT_ITER* p_iter, PF_DIR_ENT* p_ent, PF_STR*
|
||||
if (PFSTR_StrNCmp(p_pattern, (pf_s8*)"\\", 1, 0, 1) == 0 || PFSTR_StrNCmp(p_pattern, (pf_s8*)"/", 1, 0, 1) == 0) {
|
||||
err = PFENT_GetRootDir(p_iter->p_vol, p_ent);
|
||||
if (err != 0) return err;
|
||||
if (PFSTR_StrNumChar(p_pattern, 1) == 1 && PFSTR_StrNCmp(p_pattern, (pf_s8*)"\0\0\0", 2, 0, 1) == 0) return 0;
|
||||
if (PFSTR_StrNumChar(p_pattern, 1) == 1 && PFSTR_StrNCmp(p_pattern, (pf_s8*)"\0", 2, 0, 1) == 0) return 0;
|
||||
} else {
|
||||
err = PFVOL_GetCurrentDir(p_iter->p_vol, p_ent);
|
||||
if (err != 0) return err;
|
||||
@@ -728,23 +728,20 @@ pf_s32 PFENT_ITER_GetEntryOfIter(PFITER_ENT_ITER* p_iter, PF_DIR_ENT* p_ent) {
|
||||
|
||||
pf_s32 PFENT_ITER_GetLFNEntryName(PFITER_ENT_ITER* p_iter, PF_DIR_ENT* p_ent) {
|
||||
pf_u32 i;
|
||||
pf_u32 index;
|
||||
pf_s32 err;
|
||||
if (p_ent->num_entry_LFNs != 0 && !(p_ent->small_letter_flag & 0x18)) {
|
||||
index = 0;
|
||||
for (i = 0; i < p_ent->num_entry_LFNs; ++i) {
|
||||
pf_u16* destination;
|
||||
err = PFENT_ITER_Retreat(p_iter, 0);
|
||||
if (err != 0) return err;
|
||||
err = PFENT_ITER_LoadEntry(p_iter);
|
||||
if (err != 0) return err;
|
||||
destination = &p_ent->long_name[index];
|
||||
destination = &p_ent->long_name[(i * 26U) / 2U];
|
||||
pf_memcpy(destination, &p_iter->buf[1], 10);
|
||||
pf_memcpy(destination + 5, &p_iter->buf[14], 12);
|
||||
pf_memcpy(destination + 11, &p_iter->buf[28], 4);
|
||||
index += 13;
|
||||
}
|
||||
p_ent->long_name[index] = 0;
|
||||
p_ent->long_name[(p_ent->num_entry_LFNs * 26U) / 2U] = 0;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -1180,24 +1180,20 @@ s32 PFFAT_GetClusterSpecified(PFFAT_FFD* file, u32 chainIndex,
|
||||
s32 PFFAT_GetClusterAllocated(PFFAT_FFD* file, u32 chainIndex,
|
||||
u32 numClusters, u32* cluster)
|
||||
{
|
||||
u32* start;
|
||||
PF_VOLUME* vol;
|
||||
PFFAT_HINT* hint;
|
||||
u32 fatType;
|
||||
u32 locateStart;
|
||||
u32 locateEnd;
|
||||
s32 error;
|
||||
|
||||
start = file->p_start_cluster;
|
||||
vol = file->p_vol;
|
||||
fatType = vol->bpb.fat_type;
|
||||
fatType = file->p_vol->bpb.fat_type;
|
||||
hint = file->p_hint;
|
||||
if (*start == 1) {
|
||||
if (*file->p_start_cluster == 1) {
|
||||
if (fatType <= FAT_16) {
|
||||
*cluster = -1;
|
||||
return 0;
|
||||
}
|
||||
*start = vol->bpb.root_dir_cluster;
|
||||
*file->p_start_cluster = file->p_vol->bpb.root_dir_cluster;
|
||||
}
|
||||
*cluster = -1;
|
||||
error = find_cluster_in_chain(file, chainIndex, 2, numClusters, 1, cluster);
|
||||
@@ -1856,15 +1852,13 @@ s32 PFFAT_RefreshFSINFO(PF_VOLUME* volume)
|
||||
s32 alreadyAllocated;
|
||||
u32 completedBytes;
|
||||
s32 error;
|
||||
s32 error2;
|
||||
|
||||
error = 0;
|
||||
if ((volume->fsi_flag & 4) != 0) {
|
||||
error2 = PFCACHE_AllocateDataPage(volume, -1, &page,
|
||||
&alreadyAllocated);
|
||||
if (error2 != 0) {
|
||||
return error2;
|
||||
} else {
|
||||
error = PFCACHE_AllocateDataPage(volume, -1, &page,
|
||||
&alreadyAllocated);
|
||||
if (error != 0) { goto finished; }
|
||||
{
|
||||
error = PFSEC_ReadData(
|
||||
volume, page->p_buf, volume->bpb.fs_info_sector, 0,
|
||||
volume->bpb.bytes_per_sector, &completedBytes, 0);
|
||||
|
||||
@@ -126,7 +126,6 @@ pf_s32 PFFAT12_WriteFATEntryWithBuf(PF_VOLUME* p_vol, pf_s16 cluster, pf_u16 val
|
||||
pf_s32 fat_offset;
|
||||
pf_u32 fat_sector;
|
||||
pf_s32 result;
|
||||
pf_u32 next_sector;
|
||||
fat_offset = (pf_u16)(cluster + (cluster >> 1));
|
||||
fat_sector = (pf_u16)(p_vol->bpb.active_FAT_sector + (fat_offset >> p_vol->bpb.log2_bytes_per_sector));
|
||||
offset_in_sector = fat_offset & (p_vol->bpb.bytes_per_sector - 1);
|
||||
@@ -147,10 +146,10 @@ pf_s32 PFFAT12_WriteFATEntryWithBuf(PF_VOLUME* p_vol, pf_s16 cluster, pf_u16 val
|
||||
p_page->p_buf[(pf_u16)offset_in_sector] = (p_page->p_buf[(pf_u16)offset_in_sector] & 0xF) | ((value << 4) & 0xF0);
|
||||
if ((pf_u16)offset_in_sector == (pf_u32)(p_vol->bpb.bytes_per_sector - 1)) {
|
||||
FLUSH_FAT_BUFFER();
|
||||
next_sector = fat_sector + 1;
|
||||
err = VFiPFSEC_ReadFAT(p_vol, p_page->p_buf, next_sector, 0, p_vol->bpb.bytes_per_sector);
|
||||
offset_in_sector = fat_sector + 1;
|
||||
err = VFiPFSEC_ReadFAT(p_vol, p_page->p_buf, offset_in_sector, 0, p_vol->bpb.bytes_per_sector);
|
||||
if (err != 0) { return err; }
|
||||
p_page->sector = next_sector;
|
||||
p_page->sector = offset_in_sector;
|
||||
p_page->p_buf[0] = value >> 4;
|
||||
} else {
|
||||
((pf_u16)offset_in_sector + p_page->p_buf)[1] = value >> 4;
|
||||
@@ -159,10 +158,10 @@ pf_s32 PFFAT12_WriteFATEntryWithBuf(PF_VOLUME* p_vol, pf_s16 cluster, pf_u16 val
|
||||
p_page->p_buf[(pf_u16)offset_in_sector] = value;
|
||||
if ((pf_u16)offset_in_sector == (pf_u32)(p_vol->bpb.bytes_per_sector - 1)) {
|
||||
FLUSH_FAT_BUFFER();
|
||||
next_sector = fat_sector + 1;
|
||||
err = VFiPFSEC_ReadFAT(p_vol, p_page->p_buf, next_sector, 0, p_vol->bpb.bytes_per_sector);
|
||||
offset_in_sector = fat_sector + 1;
|
||||
err = VFiPFSEC_ReadFAT(p_vol, p_page->p_buf, offset_in_sector, 0, p_vol->bpb.bytes_per_sector);
|
||||
if (err != 0) { return err; }
|
||||
p_page->sector = next_sector;
|
||||
p_page->sector = offset_in_sector;
|
||||
p_page->p_buf[0] = (p_page->p_buf[0] & 0xF0) | ((pf_u8)(value >> 8));
|
||||
} else {
|
||||
((pf_u16)offset_in_sector + p_page->p_buf)[1] = (((pf_u16)offset_in_sector + p_page->p_buf)[1] & 0xF0) | ((pf_u8)(value >> 8));
|
||||
|
||||
@@ -102,7 +102,7 @@ pf_s32 PFFAT16_WriteFATEntryWithBuf(PF_VOLUME* p_vol, pf_u32 cluster, pf_u32 val
|
||||
err = VFiPFSEC_ReadFAT(p_vol, p_page->p_buf, fat_sector, 0, p_vol->bpb.bytes_per_sector);
|
||||
}
|
||||
p_page->p_buf[offset_in_sector] = value;
|
||||
p_page->p_buf[offset_in_sector + 1] = value >> 8;
|
||||
(offset_in_sector + p_page->p_buf)[1] = value >> 8;
|
||||
if (err != 0) {
|
||||
result = err;
|
||||
}
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user