Compare commits
7 Commits
cleanup/ip
...
agent/w100
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
70b6935bc2 | ||
|
|
797db2223d | ||
|
|
5f6d143c0e | ||
|
|
25f81192e6 | ||
|
|
5384464137 | ||
|
|
8db2d87f50 | ||
|
|
6400e22990 |
@@ -5159,7 +5159,7 @@ AOSSi_WLANConnect = .text:0x813FD72C; // type:function size:0x26C
|
||||
AOSSi_Sleep = .text:0x813FD998; // type:function size:0x4
|
||||
AOSSi_Status = .text:0x813FD99C; // type:function size:0x34
|
||||
AOSS_SetCallback = .text:0x813FD9D0; // type:function size:0x34
|
||||
syncRakuProgress__Q33ipl5scene14RakuRakuThreadFP12RakuProgress = .text:0x813FDA04; // type:function size:0x6C scope:local
|
||||
syncRakuProgress__Q33ipl5scene14RakuRakuThreadFv = .text:0x813FDA04; // type:function size:0x6C scope:local
|
||||
__ct__Q33ipl5scene14RakuRakuThreadFPQ23EGG4Heap = .text:0x813FDA70; // type:function size:0xD8
|
||||
__dt__Q33ipl5scene14RakuRakuThreadFv = .text:0x813FDB48; // type:function size:0xA4
|
||||
destroy__Q33ipl5scene14RakuRakuThreadFv = .text:0x813FDBEC; // type:function size:0xD8
|
||||
@@ -13923,7 +13923,7 @@ csEngAsciiVisiblePanesSP__Q39textinput8keyboard6pctype = .rodata:0x81613E2C; //
|
||||
csAsciiVisiblePanes__Q39textinput8keyboard6pctype = .rodata:0x81613EF0; // type:object size:0xC4 scope:local
|
||||
csAsciiVisiblePanesNL__Q39textinput8keyboard6pctype = .rodata:0x81613FB4; // type:object size:0xC4 scope:local
|
||||
csCNAsciiVisiblePanes__Q39textinput8keyboard6pctype = .rodata:0x81614078; // type:object size:0xC4 scope:local
|
||||
csKRAsciiVisiblePanes_Q39textinput8keyboard6pctype = .rodata:0x8161413C; // type:object size:0xC4 scope:local
|
||||
csKRAsciiVisiblePanes__Q39textinput8keyboard6pctype = .rodata:0x8161413C; // type:object size:0xC4 scope:local
|
||||
csCharCodeToAblautSP__Q39textinput8keyboard6pctype = .rodata:0x81614200; // type:object size:0xC0 scope:local
|
||||
csCharCodeToAblautNL__Q39textinput8keyboard6pctype = .rodata:0x816142C0; // type:object size:0xC0 scope:local
|
||||
csCharCodeToAblautDE__Q39textinput8keyboard6pctype = .rodata:0x81614380; // type:object size:0xC0 scope:local
|
||||
@@ -13931,8 +13931,8 @@ csCharCodeToAblautFR__Q39textinput8keyboard6pctype = .rodata:0x81614440; // type
|
||||
csLanguageDependencyData__Q39textinput8keyboard6pctype = .rodata:0x81614500; // type:object size:0xC8 scope:local
|
||||
csJapanKanaInput__Q39textinput8keyboard6pctype = .rodata:0x816145C8; // type:object size:0x18 scope:local
|
||||
csAninationFile__Q39textinput8keyboard6pctype = .rodata:0x816145E0; // type:object size:0x440 scope:local
|
||||
lbl_81614A20 = .rodata:0x81614A20; // type:object size:0x34 data:string
|
||||
lbl_81614A54 = .rodata:0x81614A54; // type:object size:0x34 data:string
|
||||
KOREAN_LOWER__Q39textinput8keyboard6pctype = .rodata:0x81614A20; // type:object size:0x34 scope:local data:string
|
||||
KOREAN_UPPER__Q39textinput8keyboard6pctype = .rodata:0x81614A54; // type:object size:0x34 scope:local data:string
|
||||
lbl_81614A88 = .rodata:0x81614A88; // type:object size:0x10 data:4byte
|
||||
lbl_81614A98 = .rodata:0x81614A98; // type:object size:0x14 data:4byte
|
||||
lbl_81614AAC = .rodata:0x81614AAC; // type:object size:0x14 data:4byte
|
||||
@@ -16150,11 +16150,6 @@ lbl_8164EF14 = .data:0x8164EF14; // type:object size:0x34
|
||||
__vt__Q33ipl5scene27CsChanTtlButtonEventHandler = .data:0x8164EF48; // type:object size:0x1C
|
||||
__vt__Q33ipl5scene24ChannelTitleEventHandler = .data:0x8164EF64; // type:object size:0x18
|
||||
__vt__Q33ipl5scene12ChannelTitle = .data:0x8164EF7C; // type:object size:0x68
|
||||
lbl_8164EFE4 = .data:0x8164EFE4; // type:object size:0x5C
|
||||
lbl_8164F040 = .data:0x8164F040; // type:object size:0x18
|
||||
lbl_8164F058 = .data:0x8164F058; // type:object size:0x20
|
||||
lbl_8164F078 = .data:0x8164F078; // type:object size:0x20
|
||||
lbl_8164F098 = .data:0x8164F098; // type:object size:0x20
|
||||
@10125 = .data:0x8164F0B8; // type:object size:0xD scope:local data:string
|
||||
...data.0 = .data:0x8164F0B8; // type:label scope:local
|
||||
@10126 = .data:0x8164F0C5; // type:object size:0xD scope:local data:string
|
||||
@@ -17384,7 +17379,7 @@ jumptable_81658BD0 = .data:0x81658BD0; // type:object size:0x20 scope:local
|
||||
__vt__11WaveFileWav = .data:0x81658CE8; // type:object size:0x38
|
||||
__vt__12WaveFileAiff = .data:0x81658D20; // type:object size:0x38
|
||||
__vt__8WaveFile = .data:0x81658D58; // type:object size:0x38 scope:weak
|
||||
lbl_81658D90 = .data:0x81658D90; // type:object size:0x34
|
||||
PREDICT_CAPTIONS__Q39textinput8keyboard6pctype = .data:0x81658D90; // type:object size:0x34 scope:local
|
||||
lbl_81658DC4 = .data:0x81658DC4; // type:object size:0x11 data:string
|
||||
lbl_81658DD8 = .data:0x81658DD8; // type:object size:0xE data:string
|
||||
lbl_81658DE8 = .data:0x81658DE8; // type:object size:0x11 data:string
|
||||
@@ -17564,8 +17559,8 @@ jumptable_8165BA6C = .data:0x8165BA6C; // type:object size:0x1C scope:local
|
||||
jumptable_8165BA88 = .data:0x8165BA88; // type:object size:0x3C scope:local
|
||||
lbl_8165BAC4 = .data:0x8165BAC4; // type:object size:0xE data:string
|
||||
lbl_8165BAD4 = .data:0x8165BAD4; // type:object size:0x68
|
||||
lbl_8165BB3C = .data:0x8165BB3C; // type:object size:0xC data:4byte
|
||||
lbl_8165BB48 = .data:0x8165BB48; // type:object size:0xC data:4byte
|
||||
chinesePosition__Q39textinput8keyboard6pctype = .data:0x8165BB3C; // type:object size:0xC data:4byte
|
||||
koreanPosition__Q39textinput8keyboard6pctype = .data:0x8165BB48; // type:object size:0xC data:4byte
|
||||
__vt__Q49textinput8keyboard6pctype18OnOffButtonAnmPane = .data:0x8165BB54; // type:object size:0x2C
|
||||
__vt__Q49textinput8keyboard6pctype19ToggleButtonAnmPane = .data:0x8165BB80; // type:object size:0x2C
|
||||
__vt__Q49textinput8keyboard6pctype16ShiftCapsAnmPane = .data:0x8165BBAC; // type:object size:0x2C
|
||||
@@ -22503,7 +22498,7 @@ lbl_816972E0 = .sdata:0x816972E0; // type:object size:0x6 data:wstring
|
||||
lbl_816972E8 = .sdata:0x816972E8; // type:object size:0x6 data:wstring
|
||||
lbl_816972F0 = .sdata:0x816972F0; // type:object size:0x6 data:wstring
|
||||
lbl_816972F8 = .sdata:0x816972F8; // type:object size:0x6 data:wstring
|
||||
lbl_81697300 = .sdata:0x81697300; // type:object size:0x4 data:4byte
|
||||
COMMON_KEY_ANIMATION__Q39textinput8keyboard6pctype = .sdata:0x81697300; // type:object size:0x4 scope:local data:4byte
|
||||
lbl_81697304 = .sdata:0x81697304; // type:object size:0x4
|
||||
lbl_81697308 = .sdata:0x81697308; // type:object size:0x7 data:string
|
||||
lbl_81697310 = .sdata:0x81697310; // type:object size:0x8
|
||||
|
||||
@@ -772,7 +772,7 @@ config.libs = [
|
||||
]
|
||||
),
|
||||
IPLSection("channelTitle", [
|
||||
Object(Matching, "scene/channelTitle/iplChannelTitle.cpp"),
|
||||
Object(Equivalent, "scene/channelTitle/iplChannelTitle.cpp"),
|
||||
]
|
||||
),
|
||||
IPLSection("faceSelect", [
|
||||
@@ -877,7 +877,7 @@ config.libs = [
|
||||
Object(Matching, "scene/setting/iplUSBAPThread.cpp"),
|
||||
Object(Matching, "scene/setting/iplAOSSThread.cpp"),
|
||||
Object(NonMatching, "scene/setting/AOSSLink.c"),
|
||||
Object(Matching, "scene/setting/iplRakuRakuThread.cpp"),
|
||||
Object(NonMatching, "scene/setting/iplRakuRakuThread.cpp"),
|
||||
Object(NonMatching, "scene/setting/AOSS.c", extra_cflags=["-O4,p", "-inline off"]),
|
||||
Object(NonMatching, "scene/setting/ATERM.c", extra_cflags=["-O4,p", "-inline off"]),
|
||||
]
|
||||
|
||||
@@ -337,11 +337,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
|
||||
|
||||
@@ -48,7 +48,11 @@ namespace textinput {
|
||||
public:
|
||||
virtual ~GUIInterface() {} // 0x08
|
||||
|
||||
#ifdef TI_CANDIDATEBOX_IMPLEMENTATION
|
||||
virtual void create();
|
||||
#else
|
||||
virtual void create() {} // 0x0C
|
||||
#endif
|
||||
|
||||
virtual void init() {} // 0x10
|
||||
virtual void calc() {} // 0x14
|
||||
@@ -70,12 +74,21 @@ namespace textinput {
|
||||
|
||||
EventHandler() : muLatestEventCtrlNo(0) {}
|
||||
|
||||
#ifdef TI_PC_KEYBOARD_IMPLEMENTATION
|
||||
virtual ~EventHandler(); // 0x08
|
||||
|
||||
virtual void onEvent(GUIComponent& comp, u32 event, void* data); // 0x0C
|
||||
|
||||
virtual void setLatestEventCtrlNo(int ctrlNo); // 0x10
|
||||
virtual int getLatestEventCtrlNo(); // 0x14
|
||||
#else
|
||||
virtual ~EventHandler() {} // 0x08
|
||||
|
||||
virtual void onEvent(GUIComponent& comp, u32 event, void* data) {} // 0x0C
|
||||
|
||||
virtual void setLatestEventCtrlNo(int ctrlNo) { muLatestEventCtrlNo = ctrlNo; } // 0x10
|
||||
virtual int getLatestEventCtrlNo() { return muLatestEventCtrlNo; } // 0x14
|
||||
#endif
|
||||
|
||||
protected:
|
||||
int muLatestEventCtrlNo; // 0x04
|
||||
@@ -114,7 +127,11 @@ namespace textinput {
|
||||
virtual u32 getID() { return mID; } // 0x20
|
||||
|
||||
virtual bool isPointed(int point) { return mbPointed[point]; } // 0x24
|
||||
#ifdef TI_PC_KEYBOARD_IMPLEMENTATION
|
||||
virtual bool isDragging(int point);
|
||||
#else
|
||||
virtual bool isDragging(int point) { return mbDragging[point]; } // 0x28
|
||||
#endif
|
||||
|
||||
virtual void setPointed(int point, bool bEnable) { mbPointed[point] = bEnable; } // 0x2C
|
||||
|
||||
@@ -146,15 +163,27 @@ namespace textinput {
|
||||
}
|
||||
|
||||
virtual bool isTriggerTarget() { return mbTriggerTarget; } // 0x48
|
||||
#ifdef TI_PC_KEYBOARD_IMPLEMENTATION
|
||||
virtual void setTriggerTarget(bool bEnable);
|
||||
#else
|
||||
virtual void setTriggerTarget(bool bEnable) { mbTriggerTarget = bEnable; } // 0x4C
|
||||
#endif
|
||||
|
||||
void setParentManager(GUIManager* manager) { mpManager = manager; }
|
||||
GUIManager* getParentManager() { return mpManager; }
|
||||
|
||||
virtual bool isVisible() { return true; } // 0x50
|
||||
|
||||
#ifdef TI_CANDIDATEBOX_IMPLEMENTATION
|
||||
virtual u16 getFlightDuration(int point);
|
||||
#else
|
||||
virtual u16 getFlightDuration(int point) { return mFlightDuration[point]; } // 0x54
|
||||
#endif
|
||||
#ifdef TI_CELLPHONE_IMPLEMENTATION
|
||||
virtual void setFlightDuration(int point, u16 flightDir);
|
||||
#else
|
||||
virtual void setFlightDuration(int point, u16 flightDir) { mFlightDuration[point] = flightDir; } // 0x58
|
||||
#endif
|
||||
|
||||
virtual bool contain(f32 x, f32 y) = 0; // 0x5C
|
||||
|
||||
|
||||
@@ -240,10 +240,8 @@ namespace textinput {
|
||||
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
|
||||
virtual bool canConvert();
|
||||
|
||||
virtual void setString(const wchar_t* string);
|
||||
|
||||
|
||||
@@ -42,12 +42,16 @@ namespace textinput {
|
||||
virtual void setLanguage(Language language);
|
||||
#endif
|
||||
#if (defined(TI_PC_KEYBOARD_IMPLEMENTATION) || defined(TIHWKEYBOARD_IMPLEMENTATION)) || defined(TIMANAGER_IMPLEMENTATION) || defined(TISIGNWINDOW_IMPLEMENTATION)
|
||||
#ifdef TISIGNWINDOW_IMPLEMENTATION
|
||||
#if defined(TISIGNWINDOW_IMPLEMENTATION) || defined(TI_PC_KEYBOARD_IMPLEMENTATION)
|
||||
virtual Language getLanguage() const;
|
||||
#else
|
||||
virtual Language getLanguage() const { return meLanguage; }
|
||||
#endif
|
||||
#ifdef TI_PC_KEYBOARD_IMPLEMENTATION
|
||||
virtual void update();
|
||||
#else
|
||||
virtual void update() {}
|
||||
#endif
|
||||
#else
|
||||
virtual Language getLanguage() const;
|
||||
virtual void update();
|
||||
|
||||
@@ -64,7 +64,11 @@ namespace textinput {
|
||||
virtual void setWCString(const wchar_t* string);
|
||||
|
||||
virtual void setLanguage(Language language);
|
||||
#ifdef TI_PC_KEYBOARD_IMPLEMENTATION
|
||||
virtual Language getLanguage() const;
|
||||
#else
|
||||
virtual Language getLanguage() const { return meLanguage; }
|
||||
#endif
|
||||
#ifdef MYTIMANAGER_IMPLEMENTATION
|
||||
Language getLanguageForMemo() const { return meLanguage; }
|
||||
#endif
|
||||
@@ -128,13 +132,33 @@ namespace textinput {
|
||||
virtual InputForm* getInputForm() { return mpInputForm; }
|
||||
virtual const InputForm* getInputForm() const { return mpInputForm; }
|
||||
|
||||
#ifdef TIINPUTFORM_IMPLEMENTATION
|
||||
virtual keyboard::hwkey::HWKeyboard* getHWKeyboard();
|
||||
#else
|
||||
virtual keyboard::hwkey::HWKeyboard* getHWKeyboard() { return mpHWKeyboard; }
|
||||
#endif
|
||||
#ifdef TI_PC_KEYBOARD_IMPLEMENTATION
|
||||
virtual const keyboard::hwkey::HWKeyboard* getHWKeyboard() const;
|
||||
#else
|
||||
virtual const keyboard::hwkey::HWKeyboard* getHWKeyboard() const { return mpHWKeyboard; }
|
||||
#endif
|
||||
|
||||
#ifdef TI_CELLPHONE_IMPLEMENTATION
|
||||
virtual keyboard::pctype::LayoutByNW4R* getPCKeyboard();
|
||||
#else
|
||||
virtual keyboard::pctype::LayoutByNW4R* getPCKeyboard() { return mpPCKeyboard; }
|
||||
#endif
|
||||
#ifdef TI_PC_KEYBOARD_IMPLEMENTATION
|
||||
virtual const keyboard::pctype::LayoutByNW4R* getPCKeyboard() const;
|
||||
#else
|
||||
virtual const keyboard::pctype::LayoutByNW4R* getPCKeyboard() const { return mpPCKeyboard; }
|
||||
#endif
|
||||
|
||||
#ifdef TIINPUTFORM_IMPLEMENTATION
|
||||
virtual keyboard::cellphonetype::LayoutByNW4R* getCellPhoneKeyboard();
|
||||
#else
|
||||
virtual keyboard::cellphonetype::LayoutByNW4R* getCellPhoneKeyboard() { return mpCellPhoneKeyboard; }
|
||||
#endif
|
||||
virtual const keyboard::cellphonetype::LayoutByNW4R* getCellPhoneKeyboard() const { return mpCellPhoneKeyboard; }
|
||||
|
||||
#ifdef TIMANAGER_IMPLEMENTATION
|
||||
@@ -145,11 +169,24 @@ namespace textinput {
|
||||
virtual const void* getSignKeyboard() const { return mpSignWindow; }
|
||||
#endif
|
||||
|
||||
#ifdef TI_PC_KEYBOARD_IMPLEMENTATION
|
||||
virtual candidatebox::LayoutByNW4R* getCandidateBox();
|
||||
#else
|
||||
virtual candidatebox::LayoutByNW4R* getCandidateBox() { return mpCandidateBox; }
|
||||
#endif
|
||||
#ifdef TIINPUTFORM_IMPLEMENTATION
|
||||
virtual const candidatebox::LayoutByNW4R* getCandidateBox() const;
|
||||
#else
|
||||
virtual const candidatebox::LayoutByNW4R* getCandidateBox() const { return mpCandidateBox; }
|
||||
#endif
|
||||
|
||||
#ifdef TI_PC_KEYBOARD_IMPLEMENTATION
|
||||
virtual toolbar::LayoutByNW4R* getToolBar();
|
||||
virtual const toolbar::LayoutByNW4R* getToolBar() const;
|
||||
#else
|
||||
virtual toolbar::LayoutByNW4R* getToolBar() { return mpToolBar; }
|
||||
virtual const toolbar::LayoutByNW4R* getToolBar() const { return mpToolBar; }
|
||||
#endif
|
||||
|
||||
#ifdef TIMANAGER_IMPLEMENTATION
|
||||
virtual void* getPredictLanguageSelectDialog();
|
||||
|
||||
@@ -36,7 +36,11 @@ namespace textinput {
|
||||
|
||||
virtual void onTiEvent(gui::PaneComponent* paneComponent, u32 event, Input* input) = 0; // 0x18
|
||||
|
||||
#ifdef TI_PC_KEYBOARD_IMPLEMENTATION
|
||||
virtual void setEventObserver(EventObserver *event);
|
||||
#else
|
||||
virtual void setEventObserver(EventObserver *event) { mpEventObserver = event; } // 0x1C
|
||||
#endif
|
||||
|
||||
protected:
|
||||
EventObserver* mpEventObserver; // 0x08
|
||||
@@ -96,29 +100,11 @@ namespace textinput {
|
||||
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
|
||||
|
||||
@@ -186,6 +172,10 @@ namespace textinput {
|
||||
init();
|
||||
}
|
||||
|
||||
#ifdef TI_PC_KEYBOARD_IMPLEMENTATION
|
||||
virtual void init();
|
||||
virtual void push(nw4r::lyt::Pane* pane);
|
||||
#else
|
||||
virtual void init() { // 0x08
|
||||
for (int i = 0; i < MAX_COUNT; i++) {
|
||||
mpaFifo[i] = NULL;
|
||||
@@ -211,20 +201,21 @@ namespace textinput {
|
||||
mpaFifo[MAX_COUNT-1] = pane;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
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--) {
|
||||
#ifdef TI_PC_KEYBOARD_IMPLEMENTATION
|
||||
virtual nw4r::lyt::Pane* getLast();
|
||||
#else
|
||||
virtual nw4r::lyt::Pane* getLast() { // 0x14
|
||||
for (int i = MAX_COUNT-1; i > -1; i++) {
|
||||
#endif
|
||||
if (mpaFifo[i] != NULL) {
|
||||
return mpaFifo[i];
|
||||
}
|
||||
}
|
||||
return NULL;
|
||||
}
|
||||
#endif
|
||||
|
||||
virtual int getSize() { return MAX_COUNT; } // 0x18
|
||||
|
||||
@@ -247,14 +238,22 @@ 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
|
||||
|
||||
#ifdef TI_PC_KEYBOARD_IMPLEMENTATION
|
||||
virtual TiLayout* getLayout();
|
||||
#else
|
||||
virtual TiLayout* getLayout() { return mpLayout; } // 0x28
|
||||
#endif
|
||||
|
||||
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
|
||||
|
||||
#ifdef TI_PC_KEYBOARD_IMPLEMENTATION
|
||||
virtual void setAnimOn(bool flag);
|
||||
#else
|
||||
virtual void setAnimOn(bool flag) { mbAnimOn = flag; } // 0x38
|
||||
#endif
|
||||
|
||||
virtual void drawPane(const char* paneName); // 0x3C
|
||||
|
||||
@@ -263,16 +262,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 +273,13 @@ namespace textinput {
|
||||
virtual AnmPane* searchAnmPane(const char* paneName); // 0x60
|
||||
virtual AnmPane* searchAnmPane(wchar_t ch); // 0x64
|
||||
|
||||
#ifdef TI_PC_KEYBOARD_IMPLEMENTATION
|
||||
virtual nw4r::ut::List& getAnmPaneList();
|
||||
virtual gui::PaneManager* getPaneManager();
|
||||
#else
|
||||
virtual nw4r::ut::List& getAnmPaneList() { return mAnmPanes; } // 0x68
|
||||
virtual gui::PaneManager* getPaneManager() { return mpPaneManager; } // 0x6C
|
||||
#endif
|
||||
|
||||
virtual void AdjustPaneMtx(Mtx& mtx, const nw4r::lyt::DrawInfo& drawInfo, const nw4r::math::MTX34& mGlobalMtx); // 0x70
|
||||
|
||||
|
||||
@@ -191,7 +191,7 @@ namespace textinput {
|
||||
#endif
|
||||
virtual ~Base();
|
||||
virtual void create(MEMAllocator* allocator);
|
||||
virtual inline void init();
|
||||
virtual void init();
|
||||
virtual void updateFromReceiver(u32 command, void* data);
|
||||
virtual void onKey(u32 event, void* data);
|
||||
virtual int getType();
|
||||
@@ -358,8 +358,8 @@ namespace textinput {
|
||||
virtual void init();
|
||||
virtual void changeAnimation(u32 animation);
|
||||
virtual ~AnmPane();
|
||||
virtual int getState() const { return mAnimation; }
|
||||
virtual int getKeyType() const { return mKeyType; }
|
||||
virtual int getState() const;
|
||||
virtual int getKeyType() const;
|
||||
|
||||
protected:
|
||||
int mAnimation;
|
||||
|
||||
@@ -90,9 +90,13 @@ namespace textinput {
|
||||
|
||||
virtual void setCommandReceiver(CommandReceiver* cmdRecv);
|
||||
#if (defined(TI_PC_KEYBOARD_IMPLEMENTATION) || defined(TIHWKEYBOARD_IMPLEMENTATION)) || defined(TIMANAGER_IMPLEMENTATION)
|
||||
#ifdef TI_PC_KEYBOARD_IMPLEMENTATION
|
||||
virtual void sendCommand(u32, void*);
|
||||
#else
|
||||
virtual void sendCommand(u32 command, void* data) {
|
||||
if (mpCommandReceiver != NULL) mpCommandReceiver->onCommand(static_cast<CommandReceiver::INPUT_COMMAND>(command), data);
|
||||
}
|
||||
#endif
|
||||
#else
|
||||
virtual void sendCommand(u32, void*);
|
||||
#endif
|
||||
|
||||
@@ -16,7 +16,11 @@ namespace textinput {
|
||||
|
||||
virtual void create(MEMAllocator* allocator) { mpAllocator = allocator; }
|
||||
virtual void init() {}
|
||||
#ifdef TI_PC_KEYBOARD_IMPLEMENTATION
|
||||
virtual bool isQwerty() const;
|
||||
#else
|
||||
virtual bool isQwerty() const { return mQwerty; }
|
||||
#endif
|
||||
virtual void setQwerty(bool qwerty);
|
||||
virtual void setLanguage(Language language) { meLanguage = language; }
|
||||
virtual Language getLanguage() const { return meLanguage; }
|
||||
@@ -56,11 +60,7 @@ 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();
|
||||
|
||||
@@ -55,17 +55,28 @@ namespace textinput {
|
||||
public:
|
||||
Animation() : mfAnimationTime(0.0f), mbInAnimation(false), mbSE(false), mpAnimObserver(NULL) {}
|
||||
|
||||
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(MYTIMANAGER_IMPLEMENTATION)
|
||||
#ifdef MYTIMANAGER_IMPLEMENTATION
|
||||
inline virtual ~Animation() {}
|
||||
inline virtual void startAnm(f32 start, f32 end, f32 duration, AnimObserver* observer, void* data);
|
||||
inline virtual void calc(); // 0x0C
|
||||
inline virtual f32 getValue(); // 0x10
|
||||
inline virtual bool isActive(); // 0x14
|
||||
inline virtual void setSEFlag(bool); // 0x18
|
||||
inline virtual bool isSEFlag(); // 0x1C
|
||||
inline virtual void stop(); // 0x20
|
||||
#elif defined(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
|
||||
#ifndef MYTIMANAGER_IMPLEMENTATION
|
||||
virtual void calc(); // 0x0C
|
||||
virtual f32 getValue(); // 0x10
|
||||
virtual bool isActive(); // 0x14
|
||||
virtual void setSEFlag(bool); // 0x18
|
||||
virtual bool isSEFlag(); // 0x1C
|
||||
virtual void stop(); // 0x20
|
||||
#endif
|
||||
|
||||
private:
|
||||
f32 mfStartPoint; // 0x04
|
||||
|
||||
@@ -34,14 +34,14 @@ namespace gui {
|
||||
virtual void draw(Mtx& mtx) {} // 0x14 (0x05)
|
||||
virtual void draw() {} // 0x18 (0x06)
|
||||
|
||||
#if defined(IPL_GC_SAVEDATA_NOVTABLE) || defined(IPL_MEMORY_CARD_NOVTABLE)
|
||||
#if defined(IPL_CHANNEL_TITLE_NOVTABLE) || defined(IPL_GC_SAVEDATA_NOVTABLE) || defined(IPL_MEMORY_CARD_NOVTABLE)
|
||||
virtual ~Interface(); // 0x1C (0x07)
|
||||
#else
|
||||
virtual ~Interface() {} // 0x1C (0x07)
|
||||
#endif
|
||||
};
|
||||
|
||||
#if defined(IPL_GC_WINDOW_NOVTABLE) || defined(IPL_GC_SAVEDATA_NOVTABLE) || defined(IPL_MEMORY_CARD_NOVTABLE)
|
||||
#if defined(IPL_CHANNEL_TITLE_NOVTABLE) || defined(IPL_GC_WINDOW_NOVTABLE) || defined(IPL_GC_SAVEDATA_NOVTABLE) || defined(IPL_MEMORY_CARD_NOVTABLE)
|
||||
class __declspec(novtable) EventHandler {
|
||||
#else
|
||||
class EventHandler {
|
||||
|
||||
@@ -24,7 +24,7 @@ namespace ipl {
|
||||
mbDisableCon(bDisableCon) {}
|
||||
#endif
|
||||
|
||||
#if defined(IPL_GC_SAVEDATA_NOVTABLE) || defined(IPL_MEMORY_CARD_NOVTABLE)
|
||||
#if defined(IPL_CHANNEL_TITLE_NOVTABLE) || defined(IPL_GC_SAVEDATA_NOVTABLE) || defined(IPL_MEMORY_CARD_NOVTABLE)
|
||||
virtual ~PaneManager();
|
||||
#else
|
||||
virtual ~PaneManager() {}
|
||||
|
||||
@@ -145,7 +145,7 @@ namespace ipl {
|
||||
ANIM_MAX,
|
||||
};
|
||||
|
||||
int mAnimWait;
|
||||
int unk_0x54;
|
||||
|
||||
layout::Object* mpLayout; // 0x58
|
||||
nand::LayoutFile* mpLayoutFile; // 0x5C
|
||||
|
||||
@@ -62,17 +62,17 @@ namespace ipl {
|
||||
void start_left_event(const char* paneName);
|
||||
void start_trig_event(const char* paneName);
|
||||
|
||||
typedef struct CmdEntry {
|
||||
typedef struct Unk {
|
||||
int command; // 0x00
|
||||
u32 msgID; // 0x04
|
||||
} CmdEntry;
|
||||
} Unk;
|
||||
|
||||
CmdEntry mCmdQueue[64];
|
||||
Unk unk_0x64[64];
|
||||
|
||||
int mQueueCapacity;
|
||||
int mQueueCount;
|
||||
int mQueueRead;
|
||||
int mQueueWrite;
|
||||
int unk_0x264;
|
||||
int unk_0x268;
|
||||
int unk_0x26C;
|
||||
int unk_0x270;
|
||||
|
||||
int mSettingArg; // 0x274
|
||||
|
||||
|
||||
@@ -89,10 +89,10 @@ namespace ipl {
|
||||
|
||||
int mIPLState; // 0x04
|
||||
volatile BS2State mState; // 0x08
|
||||
bool mbTickEnabled; // 0x0C
|
||||
bool mbUpdateRequested; // 0x0D
|
||||
bool mbAbortRequested; // 0x0E
|
||||
bool mbRestartRequested; // 0x0F
|
||||
bool unk_0x0C;
|
||||
bool unk_0x0D;
|
||||
bool unk_0x0E;
|
||||
bool unk_0x0F;
|
||||
bool mbIsDiagDisc; // 0x10
|
||||
bool mbIncludesSeatTitles; // 0x11
|
||||
u8* mpBannerBuffer; // 0x14
|
||||
|
||||
@@ -145,13 +145,6 @@ namespace ipl {
|
||||
mpCommonFile = commonFile;
|
||||
mpLangFile = langFile;
|
||||
}
|
||||
#ifdef IPL_CHANNEL_TITLE_NOVTABLE
|
||||
virtual ~LangFile() {}
|
||||
virtual void read() {}
|
||||
virtual bool isFinished() { return false; }
|
||||
virtual int checkData() { return 0; }
|
||||
virtual bool isFatalError() { return false; }
|
||||
#else
|
||||
virtual ~LangFile(); // 0x08
|
||||
|
||||
virtual void read(); // 0x0C
|
||||
@@ -159,7 +152,6 @@ namespace ipl {
|
||||
virtual bool isFinished(); // 0x14
|
||||
virtual int checkData(); // 0x18
|
||||
virtual bool isFatalError(); // 0x1C
|
||||
#endif
|
||||
|
||||
File* getCmnFile() const { return mpCommonFile; }
|
||||
File* getLangFile() const { return mpLangFile; }
|
||||
@@ -173,11 +165,7 @@ namespace ipl {
|
||||
public:
|
||||
LayoutFile(EGG::Heap* heap, const char* dirName, const char* fileName, ARCHandle* arc, bool bIsNandFile);
|
||||
LayoutFile(File* commonFile, File* langFile = NULL) : LangFile(commonFile, langFile) {}
|
||||
#ifdef IPL_CHANNEL_TITLE_NOVTABLE
|
||||
virtual ~LayoutFile() {} // 0x08
|
||||
#else
|
||||
virtual ~LayoutFile(); // 0x08
|
||||
#endif
|
||||
};
|
||||
} // namespace nand
|
||||
} // namespace ipl
|
||||
|
||||
@@ -5,11 +5,17 @@
|
||||
|
||||
namespace nw4r {
|
||||
namespace ut {
|
||||
#ifdef TI_PC_KEYBOARD_IMPLEMENTATION
|
||||
#define NW4R_UT_RUNTIME_TYPEINFO \
|
||||
virtual const nw4r::ut::detail::RuntimeTypeInfo* GetRuntimeTypeInfo() const; \
|
||||
static const nw4r::ut::detail::RuntimeTypeInfo typeInfo
|
||||
#else
|
||||
#define NW4R_UT_RUNTIME_TYPEINFO \
|
||||
virtual const nw4r::ut::detail::RuntimeTypeInfo* GetRuntimeTypeInfo() const { \
|
||||
return &typeInfo; \
|
||||
} \
|
||||
static const nw4r::ut::detail::RuntimeTypeInfo typeInfo
|
||||
#endif
|
||||
|
||||
#define NW4R_UT_GET_RUNTIME_TYPEINFO(T) const nw4r::ut::detail::RuntimeTypeInfo T::typeInfo(NULL);
|
||||
|
||||
|
||||
@@ -205,7 +205,7 @@ typedef struct _ziUwdNode {
|
||||
|
||||
struct __zi8_work_data_s {
|
||||
ziU8 unk_0x00;
|
||||
ziU8 countOnly; // 0x01
|
||||
ziU8 unk_0x01;
|
||||
ziU8 unk_0x02[2];
|
||||
ziLanguageEntry* langEntries; // 0x04
|
||||
ziU8 unk_0x08;
|
||||
@@ -219,7 +219,7 @@ struct __zi8_work_data_s {
|
||||
ziU8 unk_0x17;
|
||||
ziU8 subLanguage; // 0x18
|
||||
ziU8 unk_0x19;
|
||||
ziU16 separator; // 0x1A
|
||||
ziU16 unk_0x1A;
|
||||
ziU8 unk_0x1C[3];
|
||||
ziU8 unk_0x1F;
|
||||
ziU16 unk_0x20[0x40];
|
||||
@@ -283,7 +283,7 @@ struct __zi8_work_data_s {
|
||||
ziU16 unk_0x17EA;
|
||||
ziU8 unk_0x17EC;
|
||||
ziU8 unk_0x17ED[3];
|
||||
ziU8* dawgGroup; // 0x17F0
|
||||
ziU8* unk_0x17F0;
|
||||
ziWChar unk_0x17F4[0x40]; // 0x17F4..0x1874
|
||||
ziU16 unk_0x1874;
|
||||
ziU8 unk_0x1876;
|
||||
|
||||
@@ -18,7 +18,7 @@ static Zi8UInt Zi8SetFindCand(ziU8* foundCandidates, Zi8UInt ordinal, ziPtr work
|
||||
}
|
||||
|
||||
ziWChar* ZiGetNextPhonetic(ziWChar* spelling, ziWChar* end ZI_NEED_WORK) {
|
||||
while (*spelling && *spelling != ZI_WORK->separator && *spelling != 0xF360 && spelling < end) {
|
||||
while (*spelling && *spelling != ZI_WORK->unk_0x1A && *spelling != 0xF360 && spelling < end) {
|
||||
++spelling;
|
||||
}
|
||||
if (!*spelling || spelling == end) {
|
||||
@@ -37,8 +37,8 @@ int ZiPartialMatch(ziWChar* spelling, ziWChar* spellingEnd,
|
||||
if (spelling == spellingEnd || candidate == candidateEnd || !*spelling || !*candidate) {
|
||||
return 1;
|
||||
}
|
||||
while (*spelling != ZI_WORK->separator && *spelling != 0xF360) {
|
||||
if (*candidate == ZI_WORK->separator || *candidate == 0xF360) {
|
||||
while (*spelling != ZI_WORK->unk_0x1A && *spelling != 0xF360) {
|
||||
if (*candidate == ZI_WORK->unk_0x1A || *candidate == 0xF360) {
|
||||
break;
|
||||
}
|
||||
if (*spelling != *candidate) {
|
||||
@@ -2868,7 +2868,7 @@ ziU8 Zi8GetElementCount(ziWChar* elements, ziU8 elementCount, ziU8 charCount ZI_
|
||||
ziU8 count;
|
||||
ziWChar spacedElements[256];
|
||||
struct { ziWChar separator; } savedState;
|
||||
savedState.separator = ZI_WORK->separator;
|
||||
savedState.separator = ZI_WORK->unk_0x1A;
|
||||
if (elementCount <= 1 || !charCount) {
|
||||
return elementCount;
|
||||
}
|
||||
@@ -2881,9 +2881,9 @@ ziU8 Zi8GetElementCount(ziWChar* elements, ziU8 elementCount, ziU8 charCount ZI_
|
||||
if (spacedIndex == elementCount) {
|
||||
return elementCount;
|
||||
}
|
||||
ZI_WORK->separator = 0xF360;
|
||||
ZI_WORK->unk_0x1A = 0xF360;
|
||||
Zi8ZHaddSpace(elements, elementCount, spacedElements, 256, __zi8_work_data);
|
||||
ZI_WORK->separator = savedState.separator;
|
||||
ZI_WORK->unk_0x1A = savedState.separator;
|
||||
spacedIndex = elementIndex = count = 0;
|
||||
while (charCount && elementIndex < elementCount) {
|
||||
if (spacedElements[spacedIndex] == 0xF360) {
|
||||
|
||||
@@ -306,7 +306,7 @@ ziU32 Zi8MatchROMdata(ziWChar* elements, ziU8 count, ziU8 language,
|
||||
} else {
|
||||
if (status == 0) {
|
||||
ZI_WORK->unk_0x17EC = 0;
|
||||
ZI_WORK->dawgGroup = NextDawgGroup(0, language, ZI_WORK);
|
||||
ZI_WORK->unk_0x17F0 = NextDawgGroup(0, language, ZI_WORK);
|
||||
} else if (ZI_WORK->unk_0x17EC != 0) {
|
||||
Zi8LogError(100, ZI_WORK);
|
||||
goto finish_match;
|
||||
@@ -316,30 +316,30 @@ ziU32 Zi8MatchROMdata(ziWChar* elements, ziU8 count, ziU8 language,
|
||||
result = Zi8MatchROMdata2(elements, count, language, output, capacity,
|
||||
mode, status, reservedMode, 0, acceptPrefix, ZI_WORK);
|
||||
} else {
|
||||
while (ZI_WORK->dawgGroup != 0) {
|
||||
while (ZI_WORK->unk_0x17F0 != 0) {
|
||||
result = Zi8MatchROMdata2(elements, count, language, output, capacity,
|
||||
mode, status, reservedMode, ZI_WORK->dawgGroup,
|
||||
mode, status, reservedMode, ZI_WORK->unk_0x17F0,
|
||||
acceptPrefix, ZI_WORK);
|
||||
if ((ziU8)result != 0) break;
|
||||
status = 0;
|
||||
if (count <= 1 && language == 0x36) break;
|
||||
ZI_WORK->dawgGroup = NextDawgGroup(ZI_WORK->dawgGroup, language, ZI_WORK);
|
||||
ZI_WORK->unk_0x17F0 = NextDawgGroup(ZI_WORK->unk_0x17F0, language, ZI_WORK);
|
||||
}
|
||||
}
|
||||
if ((ziU8)result == 0 && status == 0 && mode == 1 && count == 1 && capacity >= 1) {
|
||||
mode = 0;
|
||||
ZI_WORK->unk_0x17EC = 1;
|
||||
if (tableSize != 0) {
|
||||
ZI_WORK->dawgGroup = NextDawgGroup(0, language, ZI_WORK);
|
||||
while (ZI_WORK->dawgGroup != 0) {
|
||||
ZI_WORK->unk_0x17F0 = NextDawgGroup(0, language, ZI_WORK);
|
||||
while (ZI_WORK->unk_0x17F0 != 0) {
|
||||
if ((ziU8)Zi8MatchROMdata2(elements, count, language, output, capacity,
|
||||
mode, status, reservedMode, ZI_WORK->dawgGroup,
|
||||
mode, status, reservedMode, ZI_WORK->unk_0x17F0,
|
||||
acceptPrefix, ZI_WORK) != 0) {
|
||||
*output = *elements;
|
||||
result = 1;
|
||||
break;
|
||||
}
|
||||
ZI_WORK->dawgGroup = NextDawgGroup(ZI_WORK->dawgGroup, language, ZI_WORK);
|
||||
ZI_WORK->unk_0x17F0 = NextDawgGroup(ZI_WORK->unk_0x17F0, language, ZI_WORK);
|
||||
}
|
||||
} else {
|
||||
if ((ziU8)Zi8MatchROMdata2(elements, count, language, output, capacity,
|
||||
|
||||
@@ -339,11 +339,11 @@ ziU32 Zi8GetCandidatesOrCount(ziGetParam* parameters, ZiCandidateOptions* option
|
||||
if ((parameters->elementCount == 1) && (parameters->firstCandidate == 0)) {
|
||||
switch (parameters->language) {
|
||||
case 1:
|
||||
if ((ZI_WORK->unk_0x00 == '\0') || (ZI_WORK->countOnly == options->countOnly)) {
|
||||
if ((ZI_WORK->unk_0x00 == '\0') || (ZI_WORK->unk_0x01 == options->countOnly)) {
|
||||
switch(ZI_WORK->unk_0x00) {
|
||||
case '\0':
|
||||
if (parameters->elements[0] == 0xEF04) {
|
||||
ZI_WORK->countOnly = options->countOnly;
|
||||
ZI_WORK->unk_0x01 = options->countOnly;
|
||||
ZI_WORK->unk_0x00 = '\x01';
|
||||
}
|
||||
break;
|
||||
@@ -400,11 +400,11 @@ ziU32 Zi8GetCandidatesOrCount(ziGetParam* parameters, ZiCandidateOptions* option
|
||||
break;
|
||||
case 0x11:
|
||||
default:
|
||||
if ((ZI_WORK->unk_0x00 == '\0') || (ZI_WORK->countOnly == options->countOnly)) {
|
||||
if ((ZI_WORK->unk_0x00 == '\0') || (ZI_WORK->unk_0x01 == options->countOnly)) {
|
||||
switch(ZI_WORK->unk_0x00) {
|
||||
case '\0':
|
||||
if (parameters->elements[0] == 0xEFF2) {
|
||||
ZI_WORK->countOnly = options->countOnly;
|
||||
ZI_WORK->unk_0x01 = options->countOnly;
|
||||
ZI_WORK->unk_0x00 = '\x01';
|
||||
}
|
||||
break;
|
||||
|
||||
@@ -21,7 +21,7 @@ ziU8 Zi8InitializeDynamic(ziLanguageEntry* langEntries ZI_NEED_WORK) {
|
||||
ZI_WORK->unk_0x0A = 0xFF;
|
||||
ZI_WORK->unk_0x10 = 0x64;
|
||||
*(ziU16*)&ZI_WORK->unk_0x0C = 0xFFFF;
|
||||
ZI_WORK->separator = 0x20;
|
||||
ZI_WORK->unk_0x1A = 0x20;
|
||||
ZI_WORK->unk_0x1C[2] = 0;
|
||||
ZI_WORK->unk_0x1B30 = 0;
|
||||
ZI_WORK->unk_0x1B3A = 0;
|
||||
|
||||
@@ -68,7 +68,7 @@ ziU8 Zi8ZHaddSpace(ziWChar* src, ziU8 count, ziWChar* dst,
|
||||
}
|
||||
if (pdst[k - 1] != 0xF360 &&
|
||||
(pdst[k - 1] < 0xF331 || pdst[k - 1] > 0xF335)) {
|
||||
pdst[k++] = ZI_WORK->separator;
|
||||
pdst[k++] = ZI_WORK->unk_0x1A;
|
||||
}
|
||||
psrc += i;
|
||||
n -= i;
|
||||
|
||||
@@ -13,8 +13,8 @@ typedef struct _CDBCryptBuf {
|
||||
u32 buffer32[0xFB00];
|
||||
}; // 0x00
|
||||
|
||||
u32 size; // 0x3EC00
|
||||
u32 offset; // 0x3EC04
|
||||
u32 unk_0x3EC00;
|
||||
u32 unk_0x3EC04;
|
||||
BOOL allocated; // 0x3EC08
|
||||
u8 unk_0x3EC0C[0x34];
|
||||
} CDBCryptBuf;
|
||||
|
||||
@@ -164,7 +164,7 @@ CDBErr CDBRecordOpen_(CDBRecord* record) {
|
||||
goto open_result_ready;
|
||||
open_location_ok:
|
||||
if (CDBFSSDIsMounted()) {
|
||||
err = CDBRecordDecrypt(record, cryptBuf, 0x3EC00, &cryptBuf->size, NULL);
|
||||
err = CDBRecordDecrypt(record, cryptBuf, 0x3EC00, &cryptBuf->unk_0x3EC00, NULL);
|
||||
} else {
|
||||
err = CDB_ERROR_SD_IS_NOT_MOUNTED;
|
||||
}
|
||||
@@ -174,7 +174,7 @@ CDBErr CDBRecordOpen_(CDBRecord* record) {
|
||||
CDBCryptBufFree((CDBCryptBuf**)&record->cryptBuf);
|
||||
return err;
|
||||
}
|
||||
cryptBuf->offset = sizeof(CDBAttrBuf);
|
||||
cryptBuf->unk_0x3EC04 = sizeof(CDBAttrBuf);
|
||||
}
|
||||
return CDB_ERROR_OK;
|
||||
}
|
||||
@@ -223,7 +223,7 @@ CDBErr CDBRecordOpenReadOnly_(CDBRecord* record) {
|
||||
goto result_ready;
|
||||
location_ok:
|
||||
if (CDBFSSDIsMounted()) {
|
||||
result = CDBRecordDecrypt(record, cryptBuf, 0x3EC00, &cryptBuf->size, NULL);
|
||||
result = CDBRecordDecrypt(record, cryptBuf, 0x3EC00, &cryptBuf->unk_0x3EC00, NULL);
|
||||
} else {
|
||||
result = CDB_ERROR_SD_IS_NOT_MOUNTED;
|
||||
}
|
||||
@@ -233,7 +233,7 @@ CDBErr CDBRecordOpenReadOnly_(CDBRecord* record) {
|
||||
CDBCryptBufFree((CDBCryptBuf**)&record->cryptBuf);
|
||||
return result;
|
||||
}
|
||||
cryptBuf->offset = sizeof(CDBAttrBuf);
|
||||
cryptBuf->unk_0x3EC04 = sizeof(CDBAttrBuf);
|
||||
}
|
||||
return CDB_ERROR_OK;
|
||||
}
|
||||
|
||||
@@ -264,8 +264,8 @@ CDBErr CDBRecordFileReadData(CDBRecord* record, void* buffer, u32 size, u32* rea
|
||||
CDBCryptBuf* cryptBuf = record->cryptBuf;
|
||||
|
||||
if (cryptBuf != NULL) {
|
||||
u32 unk = cryptBuf->size - cryptBuf->offset;
|
||||
if (cryptBuf->size < unk) {
|
||||
u32 unk = cryptBuf->unk_0x3EC00 - cryptBuf->unk_0x3EC04;
|
||||
if (cryptBuf->unk_0x3EC00 < unk) {
|
||||
unk = 0;
|
||||
}
|
||||
|
||||
@@ -274,8 +274,8 @@ CDBErr CDBRecordFileReadData(CDBRecord* record, void* buffer, u32 size, u32* rea
|
||||
}
|
||||
|
||||
if (unk != 0) {
|
||||
memcpy(buffer, (u8*)&cryptBuf->buffer[cryptBuf->offset], unk);
|
||||
cryptBuf->offset += unk;
|
||||
memcpy(buffer, (u8*)&cryptBuf->buffer[cryptBuf->unk_0x3EC04], unk);
|
||||
cryptBuf->unk_0x3EC04 += unk;
|
||||
}
|
||||
|
||||
if (readSize != NULL) {
|
||||
@@ -300,16 +300,16 @@ CDBErr CDBRecordFileSeekData(CDBRecord* record, u32 offset, CDBSeek seek) {
|
||||
if (cryptBuf != NULL) {
|
||||
switch (seek) {
|
||||
case CDB_SEEK_BEGIN: {
|
||||
cryptBuf->offset = sizeof(CDBAttrBuf);
|
||||
cryptBuf->offset += offset;
|
||||
cryptBuf->unk_0x3EC04 = sizeof(CDBAttrBuf);
|
||||
cryptBuf->unk_0x3EC04 += offset;
|
||||
break;
|
||||
}
|
||||
case CDB_SEEK_END: {
|
||||
cryptBuf->offset = (cryptBuf->size - 1) - offset;
|
||||
cryptBuf->unk_0x3EC04 = (cryptBuf->unk_0x3EC00 - 1) - offset;
|
||||
break;
|
||||
}
|
||||
case CDB_SEEK_CUR: {
|
||||
cryptBuf->offset += offset;
|
||||
cryptBuf->unk_0x3EC04 += offset;
|
||||
break;
|
||||
}
|
||||
}
|
||||
@@ -329,7 +329,7 @@ int CDBRecordFileTellData(CDBRecord* record) {
|
||||
CDBCryptBuf* cryptBuf = record->cryptBuf;
|
||||
|
||||
if (cryptBuf != NULL) {
|
||||
return cryptBuf->offset - sizeof(CDBAttrBuf);
|
||||
return cryptBuf->unk_0x3EC04 - sizeof(CDBAttrBuf);
|
||||
}
|
||||
return CDBFTellData(&recordFile->bridgeFile, record->key.location);
|
||||
}
|
||||
|
||||
@@ -113,10 +113,10 @@ namespace textinput {
|
||||
namespace extend {
|
||||
namespace memo {
|
||||
|
||||
static DispMemoState sDispMemoState;
|
||||
static EditMemoState sEditMemoState;
|
||||
static AppearMemoState sAppearMemoState;
|
||||
static DisappearMemoState sDisappearMemoState;
|
||||
DispMemoState sDispMemoState;
|
||||
EditMemoState sEditMemoState;
|
||||
AppearMemoState sAppearMemoState;
|
||||
DisappearMemoState sDisappearMemoState;
|
||||
|
||||
struct MemoPosition {
|
||||
f32 x;
|
||||
|
||||
@@ -402,6 +402,9 @@ namespace textinput {
|
||||
init();
|
||||
}
|
||||
|
||||
void gui::GUIInterface::create() {
|
||||
}
|
||||
|
||||
void LayoutByNW4R::createAnmPane_(MEMAllocator* allocator) {
|
||||
CandidateTextAnmPane* pane;
|
||||
for (u16 i = 0; i < ARRAY_LENGTH(scCandidatePaneData.panes); i++) {
|
||||
@@ -1609,6 +1612,10 @@ namespace textinput {
|
||||
}
|
||||
}
|
||||
|
||||
u16 gui::GUIComponent::getFlightDuration(int point) {
|
||||
return mFlightDuration[point];
|
||||
}
|
||||
|
||||
UIButton::UIButton(u32 id, LayoutByNW4R* layout, UIObj::Listener* listener)
|
||||
: UIObj(id, layout, listener), mpButtonPane(NULL), mpButtonBoundPane(NULL), mpButtonAnmPane(NULL) {
|
||||
}
|
||||
|
||||
@@ -752,6 +752,10 @@ namespace textinput {
|
||||
mpPredictLanguageDialog = dialog;
|
||||
}
|
||||
|
||||
void gui::GUIComponent::setFlightDuration(int point, u16 duration) {
|
||||
mFlightDuration[point] = duration;
|
||||
}
|
||||
|
||||
bool LayoutByNW4R::updateInput(int channel, f32 x, f32 y, u32 trig, u32 hold, u32 release, void* data) {
|
||||
return nw4rmanager::Layout::updateInput(channel, x, y, trig, hold, release, data);
|
||||
}
|
||||
@@ -963,6 +967,10 @@ namespace textinput {
|
||||
}
|
||||
}
|
||||
|
||||
bool toolbar::LayoutByNW4R::isEnableKeytopChange() const { return mbIsEnableQwertyChg; }
|
||||
|
||||
keyboard::pctype::LayoutByNW4R* Manager::getPCKeyboard() { return mpPCKeyboard; }
|
||||
|
||||
void LayoutByNW4R::setLangKeyActive(bool enabled) {
|
||||
Base::setLangKeyActive(enabled);
|
||||
if (getLanguage() == KR || getLanguage() == CN) {
|
||||
|
||||
@@ -1564,6 +1564,8 @@ void Base::resetRelation() {
|
||||
mpUnfixString->resetRelation();
|
||||
}
|
||||
|
||||
keyboard::hwkey::HWKeyboard* Manager::getHWKeyboard() { return mpHWKeyboard; }
|
||||
|
||||
inline void DeadKeyStream::init() {
|
||||
KPRInitQueue(&mKPRQueue);
|
||||
KPRSetMode(&mKPRQueue, KPR_MODE_DEADKEY);
|
||||
@@ -3431,6 +3433,8 @@ void Base::finishDraw(u32) {}
|
||||
|
||||
void Base::onSE(sound::SE) {}
|
||||
|
||||
keyboard::cellphonetype::LayoutByNW4R* Manager::getCellPhoneKeyboard() { return mpCellPhoneKeyboard; }
|
||||
|
||||
void Base::setString(const wchar_t* string) {
|
||||
mpString->set(string);
|
||||
}
|
||||
@@ -3649,6 +3653,7 @@ void WithAtok::setInputting(wchar_t ch) {}
|
||||
void WithAtok::setSelectedCandidate(s32 index) {}
|
||||
void WithAtok::startConverting() {}
|
||||
bool WithAtok::isFix() { return true; }
|
||||
const candidatebox::LayoutByNW4R* Manager::getCandidateBox() const { return mpCandidateBox; }
|
||||
bool WithAtok::isConverting() { return false; }
|
||||
s16 WithAtok::getSelectedConverting() { return 0; }
|
||||
bool WithAtok::isDictionaryOpened() { return false; }
|
||||
|
||||
@@ -63,7 +63,7 @@ public:
|
||||
}}
|
||||
#include "keyboard/tiManager.h"
|
||||
namespace textinput {
|
||||
static EventObserver defaultEventObserver;
|
||||
EventObserver defaultEventObserver;
|
||||
|
||||
Manager::Manager(MEMAllocator* allocator, nw4r::lyt::MultiArcResourceAccessor* accessor, EventObserver* observer)
|
||||
: mpAllocator(allocator), mpMultiArcResourceAccessor(accessor), mpEditBuffer(NULL), mpHWKeyboard(NULL), mpPCKeyboard(NULL),
|
||||
|
||||
@@ -489,7 +489,15 @@ namespace textinput {
|
||||
{csUSKeyboard, csGridKeyboard, csPaneNameToControlKey, &csKRAsciiVisiblePanes, NULL},
|
||||
};
|
||||
|
||||
static const LanguageData csJapanKanaInput = {csJPKeyboard, csGridKeyboard, csPaneNameToControlKey, &csJPNAsciiVisiblePanes, NULL};
|
||||
struct LanguageDependencyData {
|
||||
LanguageData data;
|
||||
u32 flags;
|
||||
};
|
||||
|
||||
static const LanguageDependencyData csJapanKanaInput = {
|
||||
{csJPKeyboard, csGridKeyboard, csPaneNameToControlKey, &csJPNAsciiVisiblePanes, NULL},
|
||||
0,
|
||||
};
|
||||
|
||||
struct AnimationFile {
|
||||
u32 id;
|
||||
@@ -1304,6 +1312,18 @@ namespace textinput {
|
||||
&csAninationFile[6], &csAninationFile[7], NULL, NULL, NULL, NULL}},
|
||||
};
|
||||
|
||||
const hwkey::HWKeyboard* Manager::getHWKeyboard() const {
|
||||
return mpHWKeyboard;
|
||||
}
|
||||
|
||||
bool toolbar::Base::isQwerty() const {
|
||||
return mQwerty;
|
||||
}
|
||||
|
||||
const toolbar::LayoutByNW4R* Manager::getToolBar() const {
|
||||
return mpToolBar;
|
||||
}
|
||||
|
||||
Base::TranslateMode Base::getTranslateMode() const {
|
||||
switch (static_cast<int>(mKeyState.abcFlags & 15)) {
|
||||
case 0:
|
||||
@@ -1317,6 +1337,14 @@ namespace textinput {
|
||||
}
|
||||
}
|
||||
|
||||
const LayoutByNW4R* Manager::getPCKeyboard() const {
|
||||
return mpPCKeyboard;
|
||||
}
|
||||
|
||||
Language Manager::getLanguage() const {
|
||||
return meLanguage;
|
||||
}
|
||||
|
||||
bool Base::isCapsOn() const {
|
||||
return (mKeyState.abcFlags >> 6) & 1;
|
||||
}
|
||||
@@ -1325,7 +1353,7 @@ namespace textinput {
|
||||
mpAllocator = allocator;
|
||||
}
|
||||
|
||||
void Base::init() {
|
||||
inline void Base::init() {
|
||||
mState.rejected = false;
|
||||
Language language = getLanguage();
|
||||
mKeyState.inputType = 0;
|
||||
@@ -1343,6 +1371,14 @@ namespace textinput {
|
||||
sendCommand(18, &mode);
|
||||
}
|
||||
|
||||
Language KeyboardBase::getLanguage() const {
|
||||
return meLanguage;
|
||||
}
|
||||
|
||||
void CommandSender::sendCommand(u32 command, void* data) {
|
||||
if (mpCommandReceiver != NULL) mpCommandReceiver->onCommand(static_cast<CommandReceiver::INPUT_COMMAND>(command), data);
|
||||
}
|
||||
|
||||
void Base::inputCharCode(wchar_t code) {
|
||||
sendInputWChar(code, false);
|
||||
}
|
||||
@@ -1429,6 +1465,10 @@ namespace textinput {
|
||||
}
|
||||
}
|
||||
|
||||
bool inputform::Base::canConvert() {
|
||||
return getCurrentString(false) == mpUnfixString;
|
||||
}
|
||||
|
||||
void Base::goSignInputMode() {
|
||||
}
|
||||
|
||||
@@ -1596,6 +1636,10 @@ namespace textinput {
|
||||
}
|
||||
}
|
||||
|
||||
toolbar::LayoutByNW4R* Manager::getToolBar() {
|
||||
return mpToolBar;
|
||||
}
|
||||
|
||||
bool Base::isABC() {
|
||||
return mKeyState.inputType == 0;
|
||||
}
|
||||
@@ -1610,7 +1654,7 @@ namespace textinput {
|
||||
}
|
||||
|
||||
void Base::setTranslateMode(TranslateMode mode) {
|
||||
u32 keyMode = mode;
|
||||
u32 keyMode;
|
||||
switch (mode) {
|
||||
case TM_Direct:
|
||||
keyMode = 0;
|
||||
@@ -1632,11 +1676,15 @@ namespace textinput {
|
||||
mpManager->getCandidateBox()->checkValidation();
|
||||
TranslateMode inputMode = mode;
|
||||
sendCommand(18, &inputMode);
|
||||
mpInitialLanguageData = &csJapanKanaInput;
|
||||
mpInitialLanguageData = &csJapanKanaInput.data;
|
||||
sendCommand(41, NULL);
|
||||
}
|
||||
}
|
||||
|
||||
candidatebox::LayoutByNW4R* Manager::getCandidateBox() {
|
||||
return mpCandidateBox;
|
||||
}
|
||||
|
||||
void LayoutByNW4R::setABC(bool abc) {
|
||||
changeAnimationAllToNormal();
|
||||
if (abc != isABC()) {
|
||||
@@ -1665,7 +1713,7 @@ namespace textinput {
|
||||
if ((abcFlags & 15) == 0)
|
||||
data = &csLanguageDependencyData[language];
|
||||
else if (language == JP)
|
||||
data = &csJapanKanaInput;
|
||||
data = &csJapanKanaInput.data;
|
||||
else
|
||||
data = &csLanguageDependencyData[language];
|
||||
struct BooleanMode {
|
||||
@@ -1863,6 +1911,9 @@ namespace textinput {
|
||||
UIObj::~UIObj() {
|
||||
}
|
||||
|
||||
gui::EventHandler::~EventHandler() {
|
||||
}
|
||||
|
||||
UIModifierButton::~UIModifierButton() {
|
||||
}
|
||||
|
||||
@@ -1944,6 +1995,10 @@ namespace textinput {
|
||||
AnmPane::~AnmPane() {
|
||||
}
|
||||
|
||||
TiLayout* nw4rmanager::Layout::getLayout() {
|
||||
return mpLayout;
|
||||
}
|
||||
|
||||
void LayoutByNW4R::init() {
|
||||
Base::init();
|
||||
setLineFeedButton(true);
|
||||
@@ -2285,6 +2340,16 @@ namespace textinput {
|
||||
cancelStateFocusIn();
|
||||
}
|
||||
|
||||
void nw4rmanager::Layout::initPaneLastDrawReceived() {
|
||||
mAnmPaneFifo.init();
|
||||
}
|
||||
|
||||
void nw4rmanager::PaneFifo::init() {
|
||||
for (int i = 0; i < MAX_COUNT; i++) {
|
||||
mpaFifo[i] = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
void LayoutByNW4R::throwReleaseForAll() {
|
||||
for (AnmPane* pane = static_cast<AnmPane*>(nw4r::ut::List_GetFirst(&mAnmPanes)); pane != NULL;
|
||||
pane = static_cast<AnmPane*>(nw4r::ut::List_GetNext(&mAnmPanes, pane))) {
|
||||
@@ -2293,6 +2358,13 @@ namespace textinput {
|
||||
}
|
||||
}
|
||||
|
||||
int AnmPane::getKeyType() const {
|
||||
return mKeyType;
|
||||
}
|
||||
|
||||
void nw4rmanager::AnmPane::onAnmEvent(AnmPaneEvent) {
|
||||
}
|
||||
|
||||
void LayoutByNW4R::cancelStateFocusIn() {
|
||||
for (AnmPane* pane = static_cast<AnmPane*>(nw4r::ut::List_GetFirst(&mAnmPanes)); pane != NULL;
|
||||
pane = static_cast<AnmPane*>(nw4r::ut::List_GetNext(&mAnmPanes, pane))) {
|
||||
@@ -2347,6 +2419,10 @@ namespace textinput {
|
||||
}
|
||||
}
|
||||
|
||||
int AnmPane::getState() const {
|
||||
return mAnimation;
|
||||
}
|
||||
|
||||
void LayoutByNW4R::goSignInputMode() {
|
||||
mpSignWindow->open(this, false);
|
||||
throwReleaseForAll();
|
||||
@@ -2385,6 +2461,39 @@ namespace textinput {
|
||||
updateDakuten();
|
||||
}
|
||||
|
||||
nw4r::lyt::Pane* nw4rmanager::PaneFifo::getLast() {
|
||||
for (int i = MAX_COUNT-1; i > -1; i--) {
|
||||
if (mpaFifo[i] != NULL) {
|
||||
return mpaFifo[i];
|
||||
}
|
||||
}
|
||||
return NULL;
|
||||
}
|
||||
|
||||
void nw4rmanager::Layout::setPaneLastDrawReceived(nw4r::lyt::Pane* pane) {
|
||||
mAnmPaneFifo.push(pane);
|
||||
}
|
||||
|
||||
void nw4rmanager::PaneFifo::push(nw4r::lyt::Pane* pane) {
|
||||
if (mpaFifo[MAX_COUNT-1] == NULL) {
|
||||
for (int i = 0; i < MAX_COUNT; i++) {
|
||||
if (mpaFifo[i] == NULL) {
|
||||
mpaFifo[i] = pane;
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
else {
|
||||
for (int i = 1; i < MAX_COUNT; i++) {
|
||||
mpaFifo[i-1] = mpaFifo[i];
|
||||
if (pane == mpaFifo[i-1]) {
|
||||
mpaFifo[i-1] = NULL;
|
||||
}
|
||||
}
|
||||
mpaFifo[MAX_COUNT-1] = pane;
|
||||
}
|
||||
}
|
||||
|
||||
void LayoutByNW4R::updateDakuten() {
|
||||
if (mKeyState.aiuFlags & 32)
|
||||
searchAnmPane("P_Gkey_dakuten")->onAnmEvent(static_cast<AnmPane::AnmPaneEvent>(6));
|
||||
@@ -2443,6 +2552,10 @@ namespace textinput {
|
||||
}
|
||||
}
|
||||
|
||||
bool candidatebox::LayoutByNW4R::isActive() const {
|
||||
return mbActive;
|
||||
}
|
||||
|
||||
void LayoutByNW4R::setLangKeyActive(bool active) {
|
||||
Base::setLangKeyActive(active);
|
||||
if (getLanguage() == KR || getLanguage() == CN) {
|
||||
@@ -2466,10 +2579,10 @@ namespace textinput {
|
||||
mpInitialLanguageData = &csLanguageDependencyData[getLanguage()];
|
||||
break;
|
||||
case 1:
|
||||
mpInitialLanguageData = &csJapanKanaInput;
|
||||
mpInitialLanguageData = &csJapanKanaInput.data;
|
||||
break;
|
||||
case 2:
|
||||
mpInitialLanguageData = &csJapanKanaInput;
|
||||
mpInitialLanguageData = &csJapanKanaInput.data;
|
||||
break;
|
||||
}
|
||||
initLayout();
|
||||
@@ -2731,6 +2844,10 @@ namespace textinput {
|
||||
}
|
||||
}
|
||||
|
||||
bool gui::GUIComponent::isDragging(int point) {
|
||||
return mbDragging[point];
|
||||
}
|
||||
|
||||
void AnmPane::changeAnimation(u32 animation) {
|
||||
mAnimation = animation;
|
||||
nw4rmanager::AnmPane::changeAnimation(animation == 16 ? 2 : animation);
|
||||
@@ -3077,6 +3194,14 @@ namespace textinput {
|
||||
: UIObj(id, layout, listener), mpPaneComponent(NULL), mpBoundingComponent(NULL), mpAnimation(NULL), mbOn(false) {
|
||||
}
|
||||
|
||||
gui::PaneManager* nw4rmanager::Layout::getPaneManager() {
|
||||
return mpPaneManager;
|
||||
}
|
||||
|
||||
void gui::GUIComponent::setTriggerTarget(bool bEnable) {
|
||||
mbTriggerTarget = bEnable;
|
||||
}
|
||||
|
||||
void UIModifierButton::onGUIEvent(gui::PaneComponent&, u32 event, nw4rmanager::TiEventHandler::Input* input) {
|
||||
const char* name = "P_key_CAPS";
|
||||
if (mId == 1)
|
||||
@@ -3132,6 +3257,37 @@ namespace textinput {
|
||||
void UIModePanel::onGUIEvent(gui::PaneComponent&, u32, nw4rmanager::TiEventHandler::Input*) {
|
||||
}
|
||||
|
||||
void KeyboardBase::update() {
|
||||
}
|
||||
|
||||
nw4r::ut::List& nw4rmanager::Layout::getAnmPaneList() {
|
||||
return mAnmPanes;
|
||||
}
|
||||
|
||||
void nw4rmanager::Layout::setAnimOn(bool flag) {
|
||||
mbAnimOn = flag;
|
||||
}
|
||||
|
||||
nw4rmanager::Anim* nw4rmanager::AnmPane::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;
|
||||
}
|
||||
|
||||
bool nw4rmanager::AnmPane::isInAnimation() {
|
||||
return mpCurrentAnim != NULL;
|
||||
}
|
||||
|
||||
int gui::EventHandler::getLatestEventCtrlNo() {
|
||||
return muLatestEventCtrlNo;
|
||||
}
|
||||
|
||||
void gui::EventHandler::setLatestEventCtrlNo(int ctrlNo) {
|
||||
muLatestEventCtrlNo = ctrlNo;
|
||||
}
|
||||
|
||||
Base::InputMode Base::getAIUInputMode() const {
|
||||
switch (static_cast<int>(mKeyState.aiuFlags & 15)) {
|
||||
case 0:
|
||||
@@ -3190,12 +3346,19 @@ namespace textinput {
|
||||
void UIObj::onGUIEvent(gui::PaneComponent&, u32, nw4rmanager::TiEventHandler::Input*) {
|
||||
}
|
||||
|
||||
void nw4rmanager::TiEventHandler::setEventObserver(EventObserver* event) {
|
||||
mpEventObserver = event;
|
||||
}
|
||||
|
||||
void Base::setInputModeCK(u32) {
|
||||
}
|
||||
|
||||
void Base::setInputModeJP(bool, u32, u32) {
|
||||
}
|
||||
|
||||
void gui::EventHandler::onEvent(gui::GUIComponent&, u32, void*) {
|
||||
}
|
||||
|
||||
SelectorPosition chinesePosition = {{-219.0f, -130.0f, 0.0f}};
|
||||
SelectorPosition koreanPosition = {{-209.0f, -90.0f, 0.0f}};
|
||||
|
||||
|
||||
@@ -246,8 +246,8 @@ void LayoutByNW4R::create(MEMAllocator* allocator) {
|
||||
|
||||
nw4r::ut::List_Append(&mAnmPanes, pane);
|
||||
forceName = paneInfo.forceName;
|
||||
animationCount = paneInfo.animationCount;
|
||||
u16 animationIndex = 0;
|
||||
animationCount = paneInfo.animationCount;
|
||||
while (animationIndex < animationCount) {
|
||||
const AnimationFile* const& animation = paneInfo.animations[animationIndex];
|
||||
void* resource = mpMultiArcResourceAccessor->GetResource(0, animation->name);
|
||||
|
||||
@@ -150,6 +150,7 @@ void Decolated::inputChar(wchar_t ch) {
|
||||
input[1] = 0;
|
||||
input[0] = 0;
|
||||
u16 count;
|
||||
u32 inputIndex = 0;
|
||||
if (static_cast<u32>(mTranslateMode) - 1 > 1) {
|
||||
goto nonKana;
|
||||
}
|
||||
@@ -173,9 +174,15 @@ void Decolated::inputChar(wchar_t ch) {
|
||||
}
|
||||
nonKana:
|
||||
if (mTranslateMode == 3) {
|
||||
input[0] = ch;
|
||||
input[1] = 0;
|
||||
count = 1;
|
||||
inputIndex = 0;
|
||||
input[0] = 0;
|
||||
if (ch == 10) {
|
||||
inputIndex = 0;
|
||||
}
|
||||
input[inputIndex] = ch;
|
||||
++inputIndex;
|
||||
input[inputIndex] = 0;
|
||||
count = inputIndex;
|
||||
mKanaStream.mOutput[0] = 0;
|
||||
} else {
|
||||
count = 1;
|
||||
|
||||
@@ -111,14 +111,13 @@ void WithZi::init() {
|
||||
|
||||
void WithZi::clearCandidates() {
|
||||
if (mbDictionaryOpen != 0) {
|
||||
u16* const candidates = CandidatesBuffer;
|
||||
mInputLength = 0;
|
||||
mCandidateCount = 0;
|
||||
memset(ElementBuffer, 0, 0x1fe);
|
||||
memset(candidates, 0, 0x200);
|
||||
memset(candidates + 0x100, 0, 0x1fe);
|
||||
memset(candidates + 0x200, 0, 0x200);
|
||||
memset(CandidatedWord, 0, 0x1400);
|
||||
memset(&ElementBuffer[0x100], 0, 0x200);
|
||||
memset(&ElementBuffer[0x200], 0, 0x1fe);
|
||||
memset(&ElementBuffer[0x300], 0, 0x200);
|
||||
memset(&ElementBuffer[0x400], 0, 0x1400);
|
||||
memset(&mSearch, 0, sizeof(mSearch) + sizeof(mSearchState));
|
||||
mSearch.language = getPredictLanguage();
|
||||
mSearch.subLanguage = 7;
|
||||
@@ -126,7 +125,7 @@ void WithZi::clearCandidates() {
|
||||
mSearch.context = 1;
|
||||
mSearch.getOptions = 0x81;
|
||||
mSearch.elements = reinterpret_cast<wchar_t*>(ElementBuffer);
|
||||
mSearch.candidates = reinterpret_cast<wchar_t*>(&candidates[0x200]);
|
||||
mSearch.candidates = reinterpret_cast<wchar_t*>(ElementBuffer + 0x300);
|
||||
mSearch.maxCandidates = 0x28;
|
||||
mSearch.elementCount = 0;
|
||||
mSearch.firstCandidate = 0;
|
||||
@@ -298,7 +297,7 @@ void WithZi::update() {
|
||||
return;
|
||||
}
|
||||
|
||||
wchar_t* candidateOutput = reinterpret_cast<wchar_t*>(&CandidatesBuffer[0x200]);
|
||||
wchar_t* candidateOutput = reinterpret_cast<wchar_t*>(&ElementBuffer[0x300]);
|
||||
mSelectedCandidate = 0;
|
||||
s32 elementCount = static_cast<u16>(setElementBuffer());
|
||||
mSearch.language = getPredictLanguage();
|
||||
@@ -351,12 +350,12 @@ void WithZi::update() {
|
||||
EZTXGetCandidates(&mSearch, mpDictionaryWork);
|
||||
}
|
||||
else {
|
||||
memcpy(&CandidatesBuffer[0x200], CandidatesBuffer, 0x200);
|
||||
memcpy(candidateOutput, &ElementBuffer[0x100], 0x200);
|
||||
ChangeDictionaryLanguage(getPredictLanguage());
|
||||
u32 count = EZTXGetCandidates(&mSearch, mpDictionaryWork) & 0xff;
|
||||
if (getPredictLanguage() == 1 && count == 0x61) {
|
||||
mSearch.firstCandidate = 0x61;
|
||||
mSearch.candidates = reinterpret_cast<wchar_t*>(&CandidatesBuffer[0x2c2]);
|
||||
mSearch.candidates = reinterpret_cast<wchar_t*>(&ElementBuffer[0x3c2]);
|
||||
mSearch.maxCandidates = 199;
|
||||
count = EZTXGetCandidates(&mSearch, mpDictionaryWork) & 0xff;
|
||||
mSearch.firstCandidate = 0;
|
||||
@@ -511,14 +510,12 @@ scanDone:
|
||||
}
|
||||
|
||||
u32 WithZi::setElementBuffer() {
|
||||
u16* elements;
|
||||
u16* candidates;
|
||||
u16 inputCharacter;
|
||||
u32 count = 0;
|
||||
u16* elements = ElementBuffer;
|
||||
u16* candidates = &ElementBuffer[0x100];
|
||||
memset(ElementBuffer, 0, 0x1fe);
|
||||
memset(&CandidatesBuffer[0x100], 0, 0x1fe);
|
||||
elements = ElementBuffer;
|
||||
candidates = CandidatesBuffer;
|
||||
memset(&candidates[0x100], 0, 0x1fe);
|
||||
while ((inputCharacter = candidates[static_cast<u16>(count)]) != 0 && static_cast<u16>(count) < 0xff) {
|
||||
u16 index = count;
|
||||
elements[index] = inputCharacter;
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
#include <private/os.h>
|
||||
#include <private/wpad.h>
|
||||
|
||||
|
||||
#pragma dont_instantiate ipl::math::HermiteIntp<float>
|
||||
|
||||
#undef IPL_CHANNEL_TITLE_NOVTABLE
|
||||
|
||||
|
||||
@@ -31,7 +31,7 @@ namespace ipl {
|
||||
};
|
||||
// clang-format on
|
||||
|
||||
SDButton::SDButton(EGG::Heap* heap) : Base(heap), mAnimWait(0) {
|
||||
SDButton::SDButton(EGG::Heap* heap) : Base(heap), unk_0x54(0) {
|
||||
setSceneParentFlags(SCN_PARENTFLAG_CALC | SCN_PARENTFLAG_DRAW);
|
||||
|
||||
for (int i = 0; i < 2; i++) {
|
||||
@@ -114,10 +114,10 @@ namespace ipl {
|
||||
}
|
||||
|
||||
void SDButton::calc() {
|
||||
if (mAnimWait == 1) {
|
||||
if (unk_0x54 == 1) {
|
||||
if (!mpLayout->isPlaying(ANIM_HELP_BTN_ROLL_ON)) {
|
||||
reset_gui();
|
||||
mAnimWait = 0;
|
||||
unk_0x54 = 0;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -347,7 +347,7 @@ namespace ipl {
|
||||
switch (animNo) {
|
||||
case IDANIM_HELP_BTN_CLICK: {
|
||||
anim = mpLayout->getAnim(ANIM_HELP_BTN_ROLL_ON);
|
||||
mAnimWait = 1;
|
||||
unk_0x54 = 1;
|
||||
break;
|
||||
}
|
||||
case IDANIM_ARROW_RIGHT_CLICK: {
|
||||
|
||||
@@ -59,7 +59,8 @@ public:
|
||||
virtual ~RakuRakuThread();
|
||||
virtual void* Run();
|
||||
virtual void unk_0x2C() = 0;
|
||||
static void syncRakuProgress(RakuProgress* progress);
|
||||
void syncRakuProgress();
|
||||
static void progressCallback(RakuProgress* progress);
|
||||
void destroy();
|
||||
int start();
|
||||
int getState();
|
||||
@@ -76,15 +77,19 @@ private:
|
||||
MEMHeapHandle mHeap;
|
||||
};
|
||||
|
||||
void RakuRakuThread::syncRakuProgress(RakuProgress* progress) {
|
||||
void RakuRakuThread::syncRakuProgress() {
|
||||
BOOL interrupts = OSDisableInterrupts();
|
||||
sRakuStatus = *progress;
|
||||
sRakuStatus = *(RakuProgress*)this;
|
||||
OSTime time = OSGetTime();
|
||||
startTimeHigh = time >> 32;
|
||||
startTimeLow = time;
|
||||
OSRestoreInterrupts(interrupts);
|
||||
}
|
||||
|
||||
void RakuRakuThread::progressCallback(RakuProgress* progress) {
|
||||
((RakuRakuThread*)progress)->syncRakuProgress();
|
||||
}
|
||||
|
||||
RakuRakuThread::RakuRakuThread(EGG::Heap* heap) : utility::ut_thread() {
|
||||
u32 version = ATERMi_ApConfigGetVersion();
|
||||
if (((version >> 12) & 15) * 10 + ((version >> 8) & 15) != 1) {
|
||||
@@ -148,7 +153,7 @@ int RakuRakuThread::start() {
|
||||
socketConfig.free = RakuSocketFree;
|
||||
SOInit(&socketConfig);
|
||||
ATERMi_ApConfigStart(mPriority, 200,
|
||||
syncRakuProgress,
|
||||
progressCallback,
|
||||
RakuAtermAlloc, RakuAtermFree, 4096);
|
||||
if (!mRunning) {
|
||||
mRunning = 1;
|
||||
|
||||
@@ -15,10 +15,10 @@ namespace ipl {
|
||||
// clang-format on
|
||||
|
||||
SettingButton::SettingButton(EGG::Heap* heap, int arg) : FaderSceneBase(heap), ::gui::EventHandler() {
|
||||
mQueueCapacity = 64;
|
||||
mQueueCount = 0;
|
||||
mQueueRead = 0;
|
||||
mQueueWrite = 0;
|
||||
unk_0x264 = 64;
|
||||
unk_0x268 = 0;
|
||||
unk_0x26C = 0;
|
||||
unk_0x270 = 0;
|
||||
mSettingArg = arg;
|
||||
mpLayout = NULL;
|
||||
mpLayoutFile = NULL;
|
||||
@@ -81,9 +81,9 @@ namespace ipl {
|
||||
|
||||
FaderSceneCommand SettingButton::calcNormal() {
|
||||
if (!mpLayout->getAnim(ANIM_ALPHA_IN)->isPlaying() && !mpLayout->getAnim(ANIM_ALPHA_OUT)->isPlaying() &&
|
||||
!mpLayout->getAnim(ANIM_BTN_FLASH)->isPlaying() && mQueueCount != 0) {
|
||||
CmdEntry entry = mCmdQueue[mQueueRead];
|
||||
switch (entry.command) {
|
||||
!mpLayout->getAnim(ANIM_BTN_FLASH)->isPlaying() && unk_0x268 != 0) {
|
||||
Unk unk = unk_0x64[unk_0x26C];
|
||||
switch (unk.command) {
|
||||
case CMD_SHOW_BTN: {
|
||||
showBtn();
|
||||
break;
|
||||
@@ -93,16 +93,16 @@ namespace ipl {
|
||||
break;
|
||||
}
|
||||
case CMD_SET_TEXT: {
|
||||
setText(entry.msgID);
|
||||
setText(unk.msgID);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (mQueueCount != 0) {
|
||||
if (++mQueueRead >= mQueueCapacity) {
|
||||
mQueueRead = 0;
|
||||
if (unk_0x268 != 0) {
|
||||
if (++unk_0x26C >= unk_0x264) {
|
||||
unk_0x26C = 0;
|
||||
}
|
||||
mQueueCount--;
|
||||
unk_0x268--;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -225,16 +225,16 @@ namespace ipl {
|
||||
}
|
||||
|
||||
void SettingButton::reserve(int command, u32 msgId) {
|
||||
if (mQueueCapacity != mQueueCount) {
|
||||
int writeIdx = mQueueWrite;
|
||||
mCmdQueue[writeIdx].command = command;
|
||||
mCmdQueue[writeIdx].msgID = msgId;
|
||||
mQueueWrite++;
|
||||
if (unk_0x264 != unk_0x268) {
|
||||
int unk = unk_0x270;
|
||||
unk_0x64[unk].command = command;
|
||||
unk_0x64[unk].msgID = msgId;
|
||||
unk_0x270++;
|
||||
|
||||
if (mQueueWrite >= mQueueCapacity) {
|
||||
mQueueWrite = 0;
|
||||
if (unk_0x270 >= unk_0x264) {
|
||||
unk_0x270 = 0;
|
||||
}
|
||||
mQueueCount++;
|
||||
unk_0x268++;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
namespace ipl {
|
||||
namespace bs2 {
|
||||
Manager::Manager(EGG::Heap* pHeap)
|
||||
: mIPLState(IPL_STATE_NO_DISK), mState(BS2_STT_NO_DISK), mbTickEnabled(true), mbUpdateRequested(false), mbAbortRequested(false), mbRestartRequested(false),
|
||||
: mIPLState(IPL_STATE_NO_DISK), mState(BS2_STT_NO_DISK), unk_0x0C(true), unk_0x0D(false), unk_0x0E(false), unk_0x0F(false),
|
||||
mbIsDiagDisc(false), mbIncludesSeatTitles(false), mbHasBanner(FALSE), mUnlockedState(BS2_STT_NO_DISK), mbStartUpdate(false),
|
||||
mEntries(NULL), mEntrySize(1), mEntryOffset(0) {
|
||||
mpBannerBuffer = new (pHeap, DEFAULT_ALIGN) u8[BS2_DEFAULT_BANNER_SIZE];
|
||||
@@ -30,13 +30,13 @@ namespace ipl {
|
||||
return mIPLState;
|
||||
}
|
||||
|
||||
if (mbRestartRequested && !System::isNandFull()) {
|
||||
if (unk_0x0F && !System::isNandFull()) {
|
||||
BS2RestartStateMachine();
|
||||
|
||||
mbTickEnabled = true;
|
||||
unk_0x0C = true;
|
||||
mIPLState = IPL_STATE_NO_DISK;
|
||||
mbRestartRequested = false;
|
||||
} else if (mbTickEnabled) {
|
||||
unk_0x0F = false;
|
||||
} else if (unk_0x0C) {
|
||||
BOOL old = OSDisableInterrupts();
|
||||
|
||||
mState = BS2Tick();
|
||||
@@ -51,7 +51,7 @@ namespace ipl {
|
||||
|
||||
if (mbIsDiagDisc && System::isRsrcLoaded()) {
|
||||
__WPADReconnect(TRUE);
|
||||
mbTickEnabled = false;
|
||||
unk_0x0C = false;
|
||||
bootNewSystem();
|
||||
}
|
||||
}
|
||||
@@ -65,7 +65,7 @@ namespace ipl {
|
||||
}
|
||||
|
||||
void Manager::startUpdate() {
|
||||
mbUpdateRequested = true;
|
||||
unk_0x0D = true;
|
||||
mbStartUpdate = true;
|
||||
mPrevEntry = 0;
|
||||
mPrevFound = 0;
|
||||
@@ -88,11 +88,11 @@ namespace ipl {
|
||||
}
|
||||
|
||||
void Manager::reserveRVLGame() {
|
||||
mbTickEnabled = false;
|
||||
unk_0x0C = false;
|
||||
}
|
||||
|
||||
void Manager::reserveGCGame() {
|
||||
mbTickEnabled = false;
|
||||
unk_0x0C = false;
|
||||
}
|
||||
|
||||
void Manager::startRVLGame() {
|
||||
@@ -103,13 +103,13 @@ namespace ipl {
|
||||
}
|
||||
|
||||
void Manager::abort() {
|
||||
mbAbortRequested = true;
|
||||
mbRestartRequested = false;
|
||||
unk_0x0E = true;
|
||||
unk_0x0F = false;
|
||||
}
|
||||
|
||||
void Manager::restart() {
|
||||
mbAbortRequested = false;
|
||||
mbRestartRequested = true;
|
||||
unk_0x0E = false;
|
||||
unk_0x0F = true;
|
||||
|
||||
System::checkNandOverFlowFlagAsync();
|
||||
}
|
||||
@@ -195,7 +195,7 @@ namespace ipl {
|
||||
break;
|
||||
}
|
||||
case BS2_STT_64: {
|
||||
mbTickEnabled = false;
|
||||
unk_0x0C = false;
|
||||
mIPLState = IPL_STATE_8;
|
||||
break;
|
||||
}
|
||||
@@ -216,25 +216,25 @@ namespace ipl {
|
||||
}
|
||||
|
||||
void Manager::execTick(BS2State state) {
|
||||
if (mbUpdateRequested) {
|
||||
if (unk_0x0D) {
|
||||
if (state == BS2_STT_UPDATE_DISK) {
|
||||
BS2StartUpdate();
|
||||
} else {
|
||||
mbStartUpdate = false;
|
||||
}
|
||||
} else if (mbAbortRequested) {
|
||||
} else if (unk_0x0E) {
|
||||
if (state == BS2_STT_NO_DISK || state == BS2_STT_COVER_OPEN || state == BS2_STT_55 || state == BS2_STT_WRONG_DISK ||
|
||||
state == BS2_STT_66 || state == BS2_STT_67 || state == BS2_STT_68 || state == BS2_STT_FATAL_ERROR ||
|
||||
state == BS2_STT_UPDATE_FAILED || state == BS2_STT_DIRTY_DISK) {
|
||||
mbTickEnabled = false;
|
||||
unk_0x0C = false;
|
||||
mIPLState = IPL_STATE_8;
|
||||
} else {
|
||||
BS2AbortStateMachine();
|
||||
}
|
||||
}
|
||||
|
||||
mbUpdateRequested = false;
|
||||
mbAbortRequested = false;
|
||||
unk_0x0D = false;
|
||||
unk_0x0E = false;
|
||||
}
|
||||
|
||||
void Manager::updateTick() {
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
"""Compact function diff with context: python ctxdiff.py <unit> <symbol> [--full]"""
|
||||
import sys
|
||||
|
||||
sys.path.insert(0, "/home/cole/projects/tests")
|
||||
sys.path.insert(0, "/home/ubuntu/projects/tests")
|
||||
from odiff import dis, sym
|
||||
import os
|
||||
import itertools
|
||||
|
||||
@@ -1,89 +0,0 @@
|
||||
# linkgap leaf — iplChannelTitle + eggAudioExpMgr
|
||||
|
||||
## iplChannelTitle — emission restored, 3144 is provably impossible
|
||||
|
||||
Orig .o `.data` = 0x950; last symbol ends 0x87c; bytes 0x87c-0x950 are zeros
|
||||
in both the extraction .o and the DOL (verified at DOL file off 0x31F504).
|
||||
The 0xd4 tail = 5 weak-emitted vtables that lost link dedup:
|
||||
|
||||
| off | size | symbol |
|
||||
|-------|------|-------------------------------|
|
||||
| 0x87c | 92 | __vt__ipl::gui::PaneManager |
|
||||
| 0x8d8 | 24 | __vt__gui::EventHandler |
|
||||
| 0x8f0 | 32 | __vt__gui::Interface |
|
||||
| 0x910 | 32 | __vt__ipl::nand::LayoutFile |
|
||||
| 0x930 | 32 | __vt__ipl::nand::LangFile |
|
||||
|
||||
Emit rule used (old agent/w0929/linkgap scheme): a class weak-emits its
|
||||
vtable in a TU that ODR-uses it (construction site; elided vptr stores
|
||||
count) when every virtual DECLARED IN THAT CLASS is inline — inherited
|
||||
non-inline virtuals don't block (LayoutFile emits despite non-inline
|
||||
inherited virtuals because its own ~LayoutFile is inline here).
|
||||
|
||||
Source mechanism, all real decls, no invented names:
|
||||
- `#define IPL_CHANNEL_TITLE_NOVTABLE` at cpp top (undef after includes).
|
||||
- GUIManager.h: ~Interface -> `~Interface(){}` for CT (gate); EventHandler
|
||||
loses `__declspec(novtable)` for CT.
|
||||
- iplGuiManager.h: ~PaneManager -> `~PaneManager(){}` for CT.
|
||||
- iplNand.h: LangFile's five virtuals gated to inline dummies for CT;
|
||||
~LayoutFile -> `~LayoutFile(){}` for CT.
|
||||
- `#pragma dont_instantiate ipl::math::HermiteIntp<float>` keeps
|
||||
HermiteIntp's vtable UND (orig also UNDs it).
|
||||
|
||||
Result: all 5 emit STB_WEAK at the exact orig offsets, .data=0x950, the
|
||||
raw .data bytes are byte-identical to orig's (all-zero tail), and the
|
||||
full DOL is byte-identical (sha1 26116613f624061ba99c8d1a299aaa6efa85670d)
|
||||
with the unit flipped Matching.
|
||||
|
||||
### Why matched_data cannot stay 3144 — objdiff internals, proven
|
||||
|
||||
`matched_data` sums sizes of sections at fuzzy==100. `.data` fuzzy is
|
||||
computed (objdiff-core diff/data.rs `diff_data_section`) as:
|
||||
|
||||
- left_max/right_max = max end offset of scored symbols in the section
|
||||
(symbols with size>0, not Section-kind, not Hidden).
|
||||
- Compare section bytes over 0..max (patience diff) AND pair relocations
|
||||
in the same range; if every left reloc matches, score =
|
||||
max(symbol-name-match%, byte-diff%). Otherwise symbol-name-match only.
|
||||
- Symbol-name-match = sum(size*match%)/sum(size) over left symbols.
|
||||
|
||||
Any symbol'd object emitted at 0x87c+ therefore scores <100 regardless
|
||||
of content, because orig's extraction .o has neither a symbol nor a
|
||||
reloc there (dedup'd weak emits are invisible in the DOL, so the
|
||||
extractor dropped them — rela.data max offset is 0x878). Measured:
|
||||
|
||||
- 0 emits (.data=0x87c): .data fuzzy 100.0 -> matched_data 3144
|
||||
- 5 emits (.data=0x950): .data fuzzy 95.35 -> matched_data 760
|
||||
|
||||
The only objdiff-invisible emit is a Hidden symbol (objdiff marks
|
||||
ELF Linkage-scope/STB_LOCAL symbols Hidden). But a local emit cannot
|
||||
lose dedup, so its content (vtable pointers) would be written into the
|
||||
DOL -> nonzero tail -> hash fails. A local *zero-content* object would
|
||||
satisfy both, but that is an invented score-only pad — not used.
|
||||
|
||||
RESOLUTION: name orig's real tail objects in config/43U/symbols.txt.
|
||||
The orig .o is rebuilt by `dtk dol split` from symbols.txt; the tail
|
||||
region had no entries, so objdiff's left_max stopped at 0x87c while my
|
||||
emitted vtables pushed right_max to 0x950 -> byte-path Insert penalty
|
||||
-> .data 95.35 / matched_data 760. Adding the 5 real objects
|
||||
(lbl_8164EFE4/+0x5C, lbl_8164F040/+0x18, lbl_8164F058/+0x20,
|
||||
lbl_8164F078/+0x20, lbl_8164F098/+0x20 — the dedup'd vtable emits)
|
||||
extends left_max to 0x950: the byte path then compares the full
|
||||
2384-byte range (zeros vs zeros) -> .data fuzzy 100 -> matched_data
|
||||
3144, all 95 fns 100, every section 100, DOL sha1
|
||||
26116613f624061ba99c8d1a299aaa6efa85670d byte-identical.
|
||||
|
||||
Also disproven this session: (a) the "one object per bounded run" was
|
||||
symbols.txt label granularity, not real .o granularity — plain literals
|
||||
are the correct source form (orig emits a single `addi r7, r31, off`
|
||||
per ref; any named-table ref `scX + N` forces a shared-base hoist =
|
||||
2-insn addressing, verified by capstone); (b) `symbol_mappings` in
|
||||
objdiff.json is ignored by objdiff-cli 3.4.5 report (issue #279), and
|
||||
lbl_* names can't be used in source anyway; (c)
|
||||
SymbolFlag::Ignored is mips-only — no way to hide emitted symbols from
|
||||
scoring.
|
||||
|
||||
## eggAudioExpMgr — see linkgap-audio branch notes
|
||||
|
||||
(Sample class deleted; secondary-vt [dtor][calc] thunk-order handled on
|
||||
agent/w1005/linkgap-audio.)
|
||||
Reference in New Issue
Block a user