Compare commits

...

7 Commits

Author SHA1 Message Date
Devin AI
70b6935bc2 tikey: non-static file-scope objects for orig GLOBAL emit parity
Orig MyTiManager.o emits sDispMemoState/sEditMemoState/sAppearMemoState/
sDisappearMemoState as GLOBAL named objects and tiKeyboard.o emits
defaultEventObserver__9textinput GLOBAL; static gave LOCAL anonymous
emits instead. Verified byte-identical DOL.

Co-Authored-By: wch <usernamecole7@gmail.com>
2026-10-03 08:05:18 +00:00
Devin AI
797db2223d tiZiString: block-scoped candidates + ElementBuffer-folded slices
setElementBuffer: declare elements/candidates before the memsets and fold
memset#2's destination through candidates (orig anchors on ElementBuffer
only — confirmed via .rela). 64/65 insns.

update: keep the candidateOutput local but express it as
&ElementBuffer[0x300] so it folds onto the single .bss anchor; drop the
extra CandidatesBuffer-base web. 446/446 insn-equal.

Co-Authored-By: wch <usernamecole7@gmail.com>
2026-10-03 01:25:35 +00:00
Devin AI
5f6d143c0e tiZiString: ElementBuffer-anchored buffer addressing
Orig anchors each fn's buffer accesses to one .bss symbol (relocs show only
ElementBuffer @ha/@l in clearCandidates/update/setElementBuffer) and folds
other buffers' addresses as plain const offsets — no per-symbol materialize.
Rewrite the slice pointers accordingly: &ElementBuffer[0x300] for the
candidates region, ElementBuffer+K for the other slices.

update 447/446 -> 446/446 insn-equal; clearCandidates 84->82 insns;
setElementBuffer 65->64/65.

Co-Authored-By: wch <usernamecole7@gmail.com>
2026-10-03 01:22:34 +00:00
Devin AI
25f81192e6 tikey: NonMatching-keyed decl gates — restore link parity
Header decl-gates for leaf TUs are now conditioned on NonMatching-only
defines (TI_PC_KEYBOARD/TI_CANDIDATEBOX/TIINPUTFORM/TI_CELLPHONE) so
linked TUs see upstream's inline bodies and emit identically to
origin/main. Reverts the unconditional decl-gates that broke the DOL
link. Full ninja verified: DOL sha1 26116613f624061ba99c8d1a299aaa6efa85670d.

Co-Authored-By: wch <usernamecole7@gmail.com>
2026-10-03 00:57:16 +00:00
Devin AI
5384464137 keyboard: tiPcKeyboard 100% — LanguageDependencyData wrapper fixes csJapanKanaInput pairing
csJapanKanaInput is a 6-word object (LanguageData data + u32 flags),
not a bare LanguageData. The symbol-size mismatch had setTranslateMode
scoring 99.05 despite byte-identical insns — objdiff pairs the reloc
target object. All 141 fns now matched, code+data complete.

Co-Authored-By: wch <usernamecole7@gmail.com>
2026-10-02 21:37:44 +00:00
Devin AI
8db2d87f50 keyboard: tiPcKeyboard setTranslateMode — uninitialized keyMode
Orig leaves keyMode uninitialized; the default case reads it cold
(mr r31,r30 dead-copy dropped). 105/105 insn-identical, unit 100/100.

Co-Authored-By: wch <usernamecole7@gmail.com>
2026-10-02 18:49:20 +00:00
Devin AI
6400e22990 keyboard: MyTiManager data 100% — Animation vtable weak-emit reproduces orig dead tail
Retail Animation had a virtual dtor + all-inline virtuals in this TU:
the TU weak-emits __vt__util::Animation (0x28) at .data+3b0 and loses
link dedup to tiInputForm.o's same-named emit, leaving all-zero extent
(orig's lbl_816681E8) and reproducing the DOL bytes exactly.

Co-Authored-By: wch <usernamecole7@gmail.com>
2026-10-02 18:48:20 +00:00
22 changed files with 358 additions and 90 deletions

View File

@@ -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
@@ -17379,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
@@ -17559,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
@@ -22498,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

View File

@@ -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

View File

@@ -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

View File

@@ -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);

View File

@@ -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();

View File

@@ -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();

View File

@@ -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

View File

@@ -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;

View File

@@ -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

View File

@@ -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();

View File

@@ -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

View File

@@ -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);

View File

@@ -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;

View File

@@ -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) {
}

View File

@@ -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) {

View File

@@ -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; }

View File

@@ -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),

View File

@@ -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}};

View File

@@ -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);

View File

@@ -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;

View File

@@ -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;

View File

@@ -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