Compare commits
1 Commits
cleanup/ip
...
agent/w092
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
2c5c982ae4 |
@@ -53,9 +53,9 @@ Progress
|
||||
<!-- progress:start -->
|
||||
| Decompiled | Matched | Linked | Data |
|
||||
|:---:|:---:|:---:|:---:|
|
||||
| 81.02% | 72.42% | 56.76% | 86.28% |
|
||||
| 82.03% | 72.73% | 56.76% | 86.28% |
|
||||
|
||||
units 748/1027 complete, functions 10585/12563 matched.
|
||||
units 748/1027 complete, functions 10617/12563 matched.
|
||||
|
||||
decompiled = code with a C/C++ implementation (objdiff fuzzy), matched = byte-exact code, linked = code actually linked into the DOL, data = byte-exact data
|
||||
<!-- progress:end -->
|
||||
|
||||
@@ -323,6 +323,9 @@ namespace textinput {
|
||||
virtual void cancelStateFocusIn(); // 0x128
|
||||
virtual void onEvent(UIObj*, u32, void*) override; // 0x12C
|
||||
|
||||
#ifdef TIINPUTFORM_IMPLEMENTATION
|
||||
UITextArea& getTextArea() { return mTextArea; }
|
||||
#endif
|
||||
void onPressedShift(bool shift);
|
||||
void onReleasedShift();
|
||||
void startTurnOn(bool);
|
||||
|
||||
@@ -2,20 +2,20 @@
|
||||
#define TEXTINPUT_CELL_PHONE_H
|
||||
|
||||
#include "tiNw4rManager.h"
|
||||
#ifdef MYTIMANAGER_IMPLEMENTATION
|
||||
#if defined(MYTIMANAGER_IMPLEMENTATION) || defined(TIINPUTFORM_IMPLEMENTATION)
|
||||
#include "tiKeyboard.h"
|
||||
#endif
|
||||
|
||||
namespace textinput {
|
||||
namespace keyboard {
|
||||
namespace cellphonetype {
|
||||
#ifdef MYTIMANAGER_IMPLEMENTATION
|
||||
#if defined(MYTIMANAGER_IMPLEMENTATION) || defined(TIINPUTFORM_IMPLEMENTATION)
|
||||
class Base : public textinput::keyboard::KeyboardBase {
|
||||
#else
|
||||
class Base {
|
||||
#endif
|
||||
public:
|
||||
#ifdef MYTIMANAGER_IMPLEMENTATION
|
||||
#if defined(MYTIMANAGER_IMPLEMENTATION) || defined(TIINPUTFORM_IMPLEMENTATION)
|
||||
enum InputMode {
|
||||
IM_00,
|
||||
IM_01,
|
||||
@@ -74,7 +74,7 @@ namespace textinput {
|
||||
|
||||
virtual void vt_0x4C();
|
||||
virtual void vt_0x50();
|
||||
#ifdef MYTIMANAGER_IMPLEMENTATION
|
||||
#if defined(MYTIMANAGER_IMPLEMENTATION) || defined(TIINPUTFORM_IMPLEMENTATION)
|
||||
virtual void doNumericMode(bool);
|
||||
#else
|
||||
virtual void vt_0x54();
|
||||
@@ -90,8 +90,11 @@ namespace textinput {
|
||||
|
||||
// TODO enum?
|
||||
int getInputType() const;
|
||||
#ifdef TIINPUTFORM_IMPLEMENTATION
|
||||
void resetHoldingButton();
|
||||
#endif
|
||||
|
||||
#ifdef MYTIMANAGER_IMPLEMENTATION
|
||||
#if defined(MYTIMANAGER_IMPLEMENTATION) || defined(TIINPUTFORM_IMPLEMENTATION)
|
||||
private:
|
||||
u32 mPreviousInputMode;
|
||||
u32 mCurrentInputMode;
|
||||
@@ -111,7 +114,7 @@ namespace textinput {
|
||||
|
||||
class LayoutByNW4R : public Base, public nw4rmanager::Layout {
|
||||
public:
|
||||
#ifdef MYTIMANAGER_IMPLEMENTATION
|
||||
#if defined(MYTIMANAGER_IMPLEMENTATION) || defined(TIINPUTFORM_IMPLEMENTATION)
|
||||
virtual void doNumericMode(bool);
|
||||
virtual void setPredictLanguageDialog(void*);
|
||||
virtual void setSignWindow(void*);
|
||||
@@ -124,7 +127,13 @@ namespace textinput {
|
||||
|
||||
void onPressedShift(bool shift);
|
||||
void onReleasedShift();
|
||||
#ifdef MYTIMANAGER_IMPLEMENTATION
|
||||
#ifdef TIINPUTFORM_IMPLEMENTATION
|
||||
bool hasLineFeedButton() const { return mbLineFeedButton; }
|
||||
private:
|
||||
bool mbLineFeedButton;
|
||||
public:
|
||||
#endif
|
||||
#if defined(MYTIMANAGER_IMPLEMENTATION) || defined(TIINPUTFORM_IMPLEMENTATION)
|
||||
virtual bool updateInput(int chan, f32 x, f32 y, u32 trig, u32 hold, u32 release, void* data) override;
|
||||
virtual bool updateInput(input::HKBManager& hkbManager) override;
|
||||
#endif
|
||||
|
||||
@@ -25,6 +25,9 @@ namespace textinput {
|
||||
#endif
|
||||
virtual bool updateInput(input::HKBManager& hkbManager);
|
||||
|
||||
#ifdef TIINPUTFORM_IMPLEMENTATION
|
||||
void resetQuoteState() { mbSingleQuoteClosing = 0; mbDoubleQuoteClosing = 0; }
|
||||
#endif
|
||||
private:
|
||||
void updateShift(input::HKBManager& hkbManager);
|
||||
void controlKeyTriggeredHandler(input::HKBManager);
|
||||
@@ -33,8 +36,13 @@ namespace textinput {
|
||||
|
||||
Manager* mpManager; // 0x10
|
||||
u8 field_0x14; // 0x14
|
||||
#ifdef TIINPUTFORM_IMPLEMENTATION
|
||||
u8 mbSingleQuoteClosing;
|
||||
u8 mbDoubleQuoteClosing;
|
||||
#else
|
||||
u8 field_0x15; // 0x15
|
||||
u8 field_0x16; // 0x16
|
||||
#endif
|
||||
};
|
||||
|
||||
|
||||
|
||||
@@ -13,14 +13,32 @@
|
||||
#include "tiZiString.h"
|
||||
#include "tiSEId.h"
|
||||
|
||||
#ifdef TIINPUTFORM_IMPLEMENTATION
|
||||
extern "C" wchar_t KPRGetChar(KPRQueue* queue);
|
||||
extern "C" void KPRPutChar(KPRQueue* queue, wchar_t character);
|
||||
extern "C" void KPRClearQueue(KPRQueue* queue);
|
||||
extern "C" u8 KPRLookAhead(KPRQueue* queue, wchar_t* character, wchar_t* combining);
|
||||
#endif
|
||||
|
||||
namespace textinput {
|
||||
namespace inputform {
|
||||
#ifdef TIINPUTFORM_IMPLEMENTATION
|
||||
class EventHandler;
|
||||
class LayoutByNW4R;
|
||||
#endif
|
||||
class EditBuffer {
|
||||
#ifdef TIINPUTFORM_IMPLEMENTATION
|
||||
friend class LayoutByNW4R;
|
||||
#endif
|
||||
public:
|
||||
#ifdef MYTIMANAGER_IMPLEMENTATION
|
||||
void create(MEMAllocator* allocator);
|
||||
#endif
|
||||
#ifdef TIINPUTFORM_IMPLEMENTATION
|
||||
virtual ~EditBuffer();
|
||||
#else
|
||||
~EditBuffer();
|
||||
#endif
|
||||
|
||||
private:
|
||||
void* mpString; // 0x04
|
||||
@@ -30,7 +48,19 @@ namespace textinput {
|
||||
};
|
||||
|
||||
class DeadKeyStream {
|
||||
#ifdef TI_PC_KEYBOARD_IMPLEMENTATION
|
||||
#if defined(TIINPUTFORM_IMPLEMENTATION)
|
||||
public:
|
||||
static wchar_t ToCombineClass(Language language, wchar_t code);
|
||||
static wchar_t ToIndependentClass(wchar_t code);
|
||||
inline wchar_t getChar();
|
||||
u8 lookAhead() { return KPRLookAhead(&mKPRQueue, NULL, NULL); }
|
||||
void putChar(wchar_t character) { KPRPutChar(&mKPRQueue, character); }
|
||||
bool isEmpty() const { return mKPRQueue.oCount == 0; }
|
||||
void clear() { KPRClearQueue(&mKPRQueue); }
|
||||
private:
|
||||
static bool sbCompatibleFilterEnabled;
|
||||
static inline bool isCompatible(wchar_t character);
|
||||
#elif defined(TI_PC_KEYBOARD_IMPLEMENTATION)
|
||||
public:
|
||||
static wchar_t ToIndependentClass(wchar_t code);
|
||||
#endif
|
||||
@@ -82,6 +112,12 @@ namespace textinput {
|
||||
|
||||
// TODO - location
|
||||
class RowInfoManager {
|
||||
#ifdef TIINPUTFORM_IMPLEMENTATION
|
||||
friend class LayoutByNW4R;
|
||||
public:
|
||||
void init();
|
||||
~RowInfoManager();
|
||||
#endif
|
||||
private:
|
||||
Info_* mpInfo; // 0x00
|
||||
u16 mMaxLength; // 0x04
|
||||
@@ -89,6 +125,33 @@ namespace textinput {
|
||||
};
|
||||
|
||||
virtual ~Base();
|
||||
#ifdef TIINPUTFORM_IMPLEMENTATION
|
||||
Base(Manager* manager);
|
||||
virtual void create(MEMAllocator* allocator);
|
||||
virtual void init();
|
||||
virtual void onCommand(INPUT_COMMAND command, void* data);
|
||||
void setCursorPos(tistring::Decolated* string, u32 pos);
|
||||
void calcCursorTimer();
|
||||
bool isAtokActive() const;
|
||||
void dirtyCacheAll();
|
||||
tistring::Decolated* getCurrentString(bool inputting);
|
||||
void moveCandidateToIdx(s32 index);
|
||||
void onPressDownHWKB();
|
||||
void onPressLeftHWKB();
|
||||
void onPressRightHWKB();
|
||||
void toggleAtokMode_(u8 operation);
|
||||
void onSpaceKeyHWKB(u32 modifiers);
|
||||
void onHKBCtrlCode(HVKCode code, u32 modifiers);
|
||||
void confirmInput_();
|
||||
void confirmInputting_(wchar_t character, bool direct, u16 letterMode, bool confirmOnly, void* holdingKey);
|
||||
void inputCharZi_(wchar_t character, u32 modifiers);
|
||||
void inputCharDefault_(wchar_t character, u32 modifiers);
|
||||
void inputInputting_(wchar_t character);
|
||||
inline bool hasZiPredictions() const;
|
||||
inline bool usesZiPrediction() const;
|
||||
inline void resetPredictionContext();
|
||||
inline void resetInputRelation();
|
||||
#endif
|
||||
|
||||
virtual void create(MEMAllocator* allocator, EditBuffer* editBuffer);
|
||||
|
||||
@@ -199,15 +262,17 @@ namespace textinput {
|
||||
|
||||
virtual void makeUpCursorPos(CursorPos* cursorPos, u32 pos, s32 startLine, s32 endLine);
|
||||
|
||||
#ifdef MYTIINPUTFORM_IMPLEMENTATION
|
||||
#if defined(MYTIINPUTFORM_IMPLEMENTATION) || defined(TIINPUTFORM_IMPLEMENTATION)
|
||||
protected:
|
||||
#ifndef TIINPUTFORM_IMPLEMENTATION
|
||||
void setCursorPos(tistring::Decolated* string, u32 pos);
|
||||
void resetRelation();
|
||||
void calcCursorTimer();
|
||||
#endif
|
||||
void resetRelation();
|
||||
#else
|
||||
private:
|
||||
#endif
|
||||
#ifdef MYTIINPUTFORM_IMPLEMENTATION
|
||||
#if defined(MYTIINPUTFORM_IMPLEMENTATION) || defined(TIINPUTFORM_IMPLEMENTATION)
|
||||
nw4r::ut::Rect mRect;
|
||||
#else
|
||||
Rect mRect;
|
||||
@@ -254,8 +319,12 @@ namespace textinput {
|
||||
};
|
||||
|
||||
class LayoutByNW4R : public Base, public nw4rmanager::Layout {
|
||||
#ifdef TIINPUTFORM_IMPLEMENTATION
|
||||
friend class EventHandler;
|
||||
inline const nw4r::lyt::Pane* getLanguageTextPane() const;
|
||||
#endif
|
||||
public:
|
||||
#ifdef MYTIMANAGER_IMPLEMENTATION
|
||||
#if defined(MYTIMANAGER_IMPLEMENTATION) || defined(TIINPUTFORM_IMPLEMENTATION)
|
||||
LayoutByNW4R(textinput::Manager*, nw4r::lyt::MultiArcResourceAccessor*, const char*, EventObserver*, const char*);
|
||||
#endif
|
||||
~LayoutByNW4R();
|
||||
@@ -284,7 +353,7 @@ namespace textinput {
|
||||
|
||||
virtual void visibleSeparator(bool flag);
|
||||
|
||||
#ifdef MYTIINPUTFORM_IMPLEMENTATION
|
||||
#if defined(MYTIINPUTFORM_IMPLEMENTATION) || defined(TIINPUTFORM_IMPLEMENTATION)
|
||||
protected:
|
||||
const void* mpLayoutData;
|
||||
const void* mpLanguageData;
|
||||
|
||||
@@ -16,7 +16,7 @@ namespace textinput {
|
||||
virtual void sendCommand(u32 command, void*) override;
|
||||
#endif
|
||||
virtual void updateFromReceiver(u32, void*) override;
|
||||
#if defined(MYTIMANAGER_IMPLEMENTATION) || defined(TI_PC_KEYBOARD_IMPLEMENTATION)
|
||||
#if defined(MYTIMANAGER_IMPLEMENTATION) || defined(TIINPUTFORM_IMPLEMENTATION) || defined(TI_PC_KEYBOARD_IMPLEMENTATION)
|
||||
virtual void onKey(u32, void*);
|
||||
#else
|
||||
virtual void onKey(u32);
|
||||
|
||||
@@ -146,6 +146,10 @@ namespace textinput {
|
||||
void enableCompatibleFilter(bool compatibleFilter);
|
||||
|
||||
bool isVacancy() const;
|
||||
#ifdef TIINPUTFORM_IMPLEMENTATION
|
||||
bool isPredictTurning() const;
|
||||
void startPredictTurnOn(bool enabled);
|
||||
#endif
|
||||
|
||||
private:
|
||||
MEMAllocator* mpAllocator; // 0x04
|
||||
|
||||
@@ -14,12 +14,22 @@ namespace textinput {
|
||||
class TiEventHandler : public gui::EventHandler {
|
||||
public:
|
||||
typedef struct Input {
|
||||
#ifdef TIINPUTFORM_IMPLEMENTATION
|
||||
u32 controller;
|
||||
f32 x;
|
||||
f32 y;
|
||||
u32 trigger;
|
||||
u32 hold;
|
||||
u32 release;
|
||||
u8 remaining[8];
|
||||
#else
|
||||
// todo
|
||||
u32 field_0x00; // 0x00
|
||||
u8 dummy[8];
|
||||
u32 field_0x0C; // 0x0C
|
||||
u32 field_0x10; // 0x10
|
||||
u8 dummy2[12];
|
||||
#endif
|
||||
} Input;
|
||||
|
||||
virtual void onEvent(gui::GUIComponent& comp, u32 event, void* data); // 0x0C
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
|
||||
#include "tiNw4rManager.h"
|
||||
#include "tiTextInputBase.h"
|
||||
#ifdef MYTIMANAGER_IMPLEMENTATION
|
||||
#if defined(MYTIMANAGER_IMPLEMENTATION) || defined(TIINPUTFORM_IMPLEMENTATION)
|
||||
#include "tiKeyboard.h"
|
||||
#endif
|
||||
|
||||
@@ -18,7 +18,7 @@ namespace textinput {
|
||||
|
||||
namespace pctype {
|
||||
|
||||
#ifdef MYTIMANAGER_IMPLEMENTATION
|
||||
#if defined(MYTIMANAGER_IMPLEMENTATION) || defined(TIINPUTFORM_IMPLEMENTATION)
|
||||
class UIObj {
|
||||
public:
|
||||
class Listener {
|
||||
@@ -29,7 +29,7 @@ namespace textinput {
|
||||
#endif
|
||||
|
||||
// TODO
|
||||
#ifdef MYTIMANAGER_IMPLEMENTATION
|
||||
#if defined(MYTIMANAGER_IMPLEMENTATION) || defined(TIINPUTFORM_IMPLEMENTATION)
|
||||
class Base : public textinput::keyboard::KeyboardBase {
|
||||
#else
|
||||
class Base : public CommandSender {
|
||||
@@ -37,6 +37,10 @@ namespace textinput {
|
||||
public:
|
||||
enum TranslateMode {
|
||||
TM_00,
|
||||
#ifdef TIINPUTFORM_IMPLEMENTATION
|
||||
TM_Kana,
|
||||
TM_Roman,
|
||||
#endif
|
||||
};
|
||||
|
||||
enum InputType {
|
||||
@@ -47,7 +51,7 @@ namespace textinput {
|
||||
IT_04,
|
||||
};
|
||||
|
||||
#ifdef MYTIMANAGER_IMPLEMENTATION
|
||||
#if defined(MYTIMANAGER_IMPLEMENTATION) || defined(TIINPUTFORM_IMPLEMENTATION)
|
||||
enum InputMode {
|
||||
IM_00,
|
||||
IM_01,
|
||||
@@ -126,7 +130,7 @@ namespace textinput {
|
||||
virtual void updateFixMode();
|
||||
#endif
|
||||
|
||||
#ifdef MYTIMANAGER_IMPLEMENTATION
|
||||
#if defined(MYTIMANAGER_IMPLEMENTATION) || defined(TIINPUTFORM_IMPLEMENTATION)
|
||||
private:
|
||||
u8 mKeyboardInputFlags[8];
|
||||
const void* mpKeyStateTable;
|
||||
@@ -136,6 +140,9 @@ namespace textinput {
|
||||
u32 mCurrentInputType;
|
||||
u32 mInputState;
|
||||
const void* mpLanguageData;
|
||||
#ifdef TIINPUTFORM_IMPLEMENTATION
|
||||
MEMAllocator* mpAllocator;
|
||||
#endif
|
||||
bool mbOnlyQwerty;
|
||||
bool mbLanguageKeyActive;
|
||||
u16 mKeyboardFlags;
|
||||
@@ -143,6 +150,10 @@ namespace textinput {
|
||||
void* mpCurrentKeyState;
|
||||
|
||||
public:
|
||||
#ifdef TIINPUTFORM_IMPLEMENTATION
|
||||
bool isQwertyOnly() const { return mbOnlyQwerty; }
|
||||
bool isLanguageKeyActive() const { return mbLanguageKeyActive; }
|
||||
#endif
|
||||
u32 getTranslateModeForMemo() const { return mTranslateMode; }
|
||||
u32 getABCInputModeForMemo() const { return mABCInputMode; }
|
||||
u32 getAIUInputModeForMemo() const { return mAIUInputMode; }
|
||||
@@ -151,14 +162,14 @@ namespace textinput {
|
||||
|
||||
// TODO
|
||||
class LayoutByNW4R : public Base, public nw4rmanager::Layout
|
||||
#ifdef MYTIMANAGER_IMPLEMENTATION
|
||||
#if defined(MYTIMANAGER_IMPLEMENTATION) || defined(TIINPUTFORM_IMPLEMENTATION)
|
||||
, public UIObj::Listener
|
||||
#endif
|
||||
{
|
||||
public:
|
||||
// TODO - ...
|
||||
|
||||
#ifdef MYTIMANAGER_IMPLEMENTATION
|
||||
#if defined(MYTIMANAGER_IMPLEMENTATION) || defined(TIINPUTFORM_IMPLEMENTATION)
|
||||
virtual void draw();
|
||||
virtual void calc();
|
||||
virtual void setPredictLanguageDialog(void*);
|
||||
@@ -171,7 +182,15 @@ namespace textinput {
|
||||
|
||||
void onPressedShift(bool shift);
|
||||
void onReleasedShift();
|
||||
#ifdef MYTIMANAGER_IMPLEMENTATION
|
||||
#ifdef TIINPUTFORM_IMPLEMENTATION
|
||||
bool hasLineFeedButton() const { return mbLineFeedButton; }
|
||||
private:
|
||||
void* mpPredictLanguageDialog;
|
||||
void* mpSignWindow;
|
||||
bool mbLineFeedButton;
|
||||
public:
|
||||
#endif
|
||||
#if defined(MYTIMANAGER_IMPLEMENTATION) || defined(TIINPUTFORM_IMPLEMENTATION)
|
||||
virtual bool updateInput(int chan, f32 x, f32 y, u32 trig, u32 hold, u32 release, void* data) override;
|
||||
virtual bool updateInput(input::HKBManager& hkbManager) override;
|
||||
#endif
|
||||
|
||||
@@ -36,7 +36,11 @@ namespace textinput {
|
||||
virtual wchar_t* getWCString() const { return mpszString; }
|
||||
|
||||
virtual void setCandidate(wchar_t candidate) { mwcCandidate = candidate; }
|
||||
#ifdef TIINPUTFORM_IMPLEMENTATION
|
||||
virtual wchar_t getCandidate() const { return mwcCandidate; }
|
||||
#else
|
||||
virtual wchar_t getCandidate() { return mwcCandidate; }
|
||||
#endif
|
||||
virtual bool hasCandidate() const;
|
||||
|
||||
virtual wchar_t getLastWChar();
|
||||
@@ -60,8 +64,54 @@ namespace textinput {
|
||||
|
||||
class Decolated : public StringBase {
|
||||
public:
|
||||
#ifdef TIINPUTFORM_IMPLEMENTATION
|
||||
Decolated(u16 maxLen) : StringBase(maxLen), mCursorStart(0), mCursorEnd(0), mbSustain(false), mTranslateMode(0) { initKanaConverter(); }
|
||||
#else
|
||||
Decolated(u16 maxLen) : StringBase(maxLen), field_0x18(0), field_0x1C(0), field_0x20(0), field_0x24(0) { initKanaConverter(); }
|
||||
#endif
|
||||
|
||||
#ifdef TIINPUTFORM_IMPLEMENTATION
|
||||
enum TranslateMode { TM_Direct, TM_Kana, TM_Roman, TM_Hangul };
|
||||
void setTranslateMode(TranslateMode mode);
|
||||
TranslateMode getTranslateMode() const { return static_cast<TranslateMode>(mTranslateMode); }
|
||||
void inputString(const wchar_t* string, TranslateMode mode);
|
||||
virtual void inputChar(wchar_t ch);
|
||||
virtual void inputString(const wchar_t* string);
|
||||
virtual void deleteChar();
|
||||
virtual void backSpace();
|
||||
virtual void confirm(const wchar_t* string);
|
||||
virtual bool moveCursorRight();
|
||||
virtual bool moveCursorLeft();
|
||||
virtual void setCursorPos(u32 pos);
|
||||
virtual void onSustain();
|
||||
virtual void offSustain();
|
||||
virtual bool isOnSustain();
|
||||
virtual u32 getCursorPos() const;
|
||||
virtual void getCursorPos(u32* start, u32* end);
|
||||
virtual bool canBackSpace();
|
||||
#ifdef TIINPUTFORM_IMPLEMENTATION
|
||||
virtual bool deleteForward();
|
||||
#else
|
||||
virtual void deleteForward();
|
||||
#endif
|
||||
virtual void getSelected(u32& start, u32& end);
|
||||
virtual wchar_t getWCharAtCursor();
|
||||
virtual void replaceAtCursor(wchar_t ch);
|
||||
virtual bool isDakuten();
|
||||
virtual void converDakuten();
|
||||
virtual bool isHandaku();
|
||||
virtual void converHandaku();
|
||||
virtual void convertAll();
|
||||
virtual bool isSmall();
|
||||
virtual void converSmall();
|
||||
virtual bool atTheBeginningOfASentence();
|
||||
virtual void initKanaConverter();
|
||||
virtual wchar_t* getKanaBuffer();
|
||||
virtual bool isKanaFix() const;
|
||||
virtual void confirmKana();
|
||||
virtual void clearKana();
|
||||
virtual void EnableKSXFilter(bool enable);
|
||||
#else
|
||||
virtual void inputChar();
|
||||
virtual void inputString();
|
||||
virtual void deleteChar();
|
||||
@@ -95,15 +145,73 @@ namespace textinput {
|
||||
virtual void clearKana();
|
||||
virtual void EnableKSXFilter();
|
||||
|
||||
#endif
|
||||
|
||||
private:
|
||||
#ifdef TIINPUTFORM_IMPLEMENTATION
|
||||
u32 mCursorStart;
|
||||
u32 mCursorEnd;
|
||||
bool mbSustain;
|
||||
u32 mTranslateMode;
|
||||
#else
|
||||
u32 field_0x18; // 0x18
|
||||
u32 field_0x1C; // 0x1C
|
||||
u8 field_0x20; // 0x20
|
||||
u32 field_0x24; // 0x24
|
||||
#endif
|
||||
KanaStream mKanaStream; // 0x28
|
||||
};
|
||||
|
||||
#ifdef TIINPUTFORM_IMPLEMENTATION
|
||||
class WithAtok : public Decolated {
|
||||
public:
|
||||
virtual void pushBack(wchar_t ch);
|
||||
virtual void popBack();
|
||||
virtual void inputChar(wchar_t ch);
|
||||
virtual void backSpace();
|
||||
virtual void confirm(const wchar_t* string);
|
||||
virtual bool moveCursorRight();
|
||||
virtual bool moveCursorLeft();
|
||||
virtual void getCursorPos(u32* start, u32* end);
|
||||
struct DrawInfo {
|
||||
const wchar_t* string;
|
||||
u32 start;
|
||||
u32 end;
|
||||
u32 selectedStart;
|
||||
u32 selectedEnd;
|
||||
};
|
||||
virtual bool isFix();
|
||||
virtual void setFix(bool fix);
|
||||
virtual void initConverting();
|
||||
virtual bool isConverting();
|
||||
virtual wchar_t* getConfirmedWCString() const;
|
||||
virtual int getCurrentNumPredicted();
|
||||
virtual void getPredicted(int index, wchar_t* string);
|
||||
virtual void commitPredicted(int index);
|
||||
virtual void setSelectedCandidate(s32 index);
|
||||
virtual bool isCandidateSelected();
|
||||
virtual s32 getSelectedCandidate();
|
||||
virtual void init();
|
||||
virtual void setInputting(wchar_t ch);
|
||||
virtual void getDrawString(DrawInfo& info);
|
||||
virtual void openDictionary(void* atok, int atokSize, void* apot, int apotSize, void* nintendo, int nintendoSize);
|
||||
virtual void closeDictionary();
|
||||
virtual bool hasConfirmedString();
|
||||
virtual void enableConfirmedString(bool enable);
|
||||
virtual void startConverting();
|
||||
virtual bool isDictionaryOpened();
|
||||
virtual void changeKanaMode(bool kana);
|
||||
virtual wchar_t getInputStringLength();
|
||||
virtual void resetRelation();
|
||||
virtual void setFixMode(bool fixed);
|
||||
virtual void setFixPrediction(int count, const char** predictions);
|
||||
virtual void setDefaultPrediction(int count, const char** predictions);
|
||||
virtual s16 getSelectedConverting();
|
||||
virtual s16 getFixedPredictionNum();
|
||||
};
|
||||
#else
|
||||
class WithAtok : public StringBase {};
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
|
||||
namespace textinput {
|
||||
namespace textdrawer {
|
||||
#if defined(MYTIMANAGER_IMPLEMENTATION) || defined(MYTIINPUTFORM_IMPLEMENTATION)
|
||||
#if defined(MYTIMANAGER_IMPLEMENTATION) || defined(MYTIINPUTFORM_IMPLEMENTATION) || defined(TIINPUTFORM_IMPLEMENTATION)
|
||||
class Base : public nw4r::ut::CharWriter {
|
||||
#else
|
||||
class Base : nw4r::ut::CharWriter {
|
||||
@@ -31,7 +31,12 @@ namespace textinput {
|
||||
} CursorPos;
|
||||
|
||||
typedef struct DrawInfo {
|
||||
#ifdef TIINPUTFORM_IMPLEMENTATION
|
||||
nw4r::ut::Rect rect;
|
||||
wchar_t character;
|
||||
#else
|
||||
u8 unk_0x00[32];
|
||||
#endif
|
||||
} DrawInfo;
|
||||
|
||||
virtual void create(MEMAllocator* allocator);
|
||||
@@ -80,17 +85,51 @@ namespace textinput {
|
||||
virtual void setDrawModifyScopeLine();
|
||||
virtual void setDrawCacheScopeLine();
|
||||
virtual void modifyCursorCache();
|
||||
#ifdef TIINPUTFORM_IMPLEMENTATION
|
||||
virtual bool isEnableCursorCache() const;
|
||||
#else
|
||||
virtual void isEnableCursorCache();
|
||||
#endif
|
||||
#ifdef TIINPUTFORM_IMPLEMENTATION
|
||||
virtual u32 getDrawModifyStartLine() const;
|
||||
virtual u32 getDrawModifyEndLine() const;
|
||||
#else
|
||||
virtual void getDrawModifyStartLine();
|
||||
virtual void getDrawModifyEndLine();
|
||||
#endif
|
||||
virtual u32 getDrawCacheStartPos() const;
|
||||
virtual void dirtyDrawCache();
|
||||
virtual void dirtyCursorCache();
|
||||
|
||||
#ifdef TIINPUTFORM_IMPLEMENTATION
|
||||
protected:
|
||||
u8 mDrawConfiguration[0x50];
|
||||
u32 muLine;
|
||||
f32 mfLineSpacing;
|
||||
f32 mfCharacterSpacing;
|
||||
f32 mfFontWidth;
|
||||
f32 mfFontHeight;
|
||||
u32 muModifyStartLine;
|
||||
u32 muModifyEndLine;
|
||||
u32 muDrawStartPos;
|
||||
u32 muDrawEndPos;
|
||||
u32 muDrawCacheStartPos;
|
||||
#else
|
||||
private:
|
||||
u8 unk_0x50[0x78];
|
||||
#endif
|
||||
bool mbSecretMode; // 0xC8
|
||||
#ifdef MYTIINPUTFORM_IMPLEMENTATION
|
||||
#ifdef TIINPUTFORM_IMPLEMENTATION
|
||||
u32 muDrawModifyStartLine;
|
||||
u32 muDrawModifyEndLine;
|
||||
u32 muDrawModifyStartPos;
|
||||
u32 muDrawModifyEndPos;
|
||||
u32 muCachedStartPos;
|
||||
u32 muCachedEndPos;
|
||||
bool mbDrawCache;
|
||||
u8 mCursorCacheConfiguration[0x1F];
|
||||
bool mbCursorCache;
|
||||
#elif defined(MYTIINPUTFORM_IMPLEMENTATION)
|
||||
protected:
|
||||
u8 mDrawState[0x27];
|
||||
f32 mfDrawScrollY;
|
||||
|
||||
@@ -39,6 +39,10 @@ namespace textinput {
|
||||
f32 y; // 0x08
|
||||
} Scroll;
|
||||
|
||||
#ifdef TIINPUTFORM_IMPLEMENTATION
|
||||
enum HVKCode { HVK_None = 0 };
|
||||
#endif
|
||||
|
||||
class Base {
|
||||
public :
|
||||
virtual ~Base() {}
|
||||
@@ -50,7 +54,7 @@ namespace textinput {
|
||||
class CommandSender;
|
||||
class CommandReceiver : public Base {
|
||||
public:
|
||||
#ifdef MYTIINPUTFORM_IMPLEMENTATION
|
||||
#if defined(MYTIINPUTFORM_IMPLEMENTATION) || defined(TIINPUTFORM_IMPLEMENTATION)
|
||||
struct Scroll {
|
||||
bool absY;
|
||||
f32 x;
|
||||
|
||||
@@ -7,6 +7,9 @@
|
||||
|
||||
namespace textinput {
|
||||
namespace util {
|
||||
#ifdef TIINPUTFORM_IMPLEMENTATION
|
||||
wchar_t HankakuToZenkaku(wchar_t ch);
|
||||
#endif
|
||||
wchar_t toWLower(wchar_t ch);
|
||||
wchar_t toWUpper(wchar_t ch);
|
||||
|
||||
@@ -46,7 +49,11 @@ namespace textinput {
|
||||
public:
|
||||
Animation() : mfAnimationTime(0.0f), mbInAnimation(false), mbSE(false), mpAnimObserver(NULL) {}
|
||||
|
||||
virtual void startAnm(AnimObserver*, f32, f32, f32, void*); // 0x08
|
||||
#ifdef TIINPUTFORM_IMPLEMENTATION
|
||||
virtual void startAnm(f32 start, f32 end, f32 duration, AnimObserver* observer, void* data);
|
||||
#else
|
||||
virtual void startAnm(AnimObserver*, f32, f32, f32, void*);
|
||||
#endif // 0x08
|
||||
virtual void calc(); // 0x0C
|
||||
virtual f32 getValue(); // 0x10
|
||||
virtual bool isActive(); // 0x14
|
||||
|
||||
@@ -1,14 +1,66 @@
|
||||
#ifndef TEXTINPUT_ZI_STRING_H
|
||||
#define TEXTINPUT_ZI_STRING_H
|
||||
|
||||
#ifdef TIINPUTFORM_IMPLEMENTATION
|
||||
#include "tiString.h"
|
||||
#include <eztx.h>
|
||||
#endif
|
||||
|
||||
namespace textinput {
|
||||
namespace tistring {
|
||||
#ifdef TIINPUTFORM_IMPLEMENTATION
|
||||
class WithZi : public Decolated {
|
||||
public:
|
||||
enum PredictLanguage { PL_Default };
|
||||
enum LetterMode { LM_Lower, LM_Normal, LM_Upper };
|
||||
virtual ~WithZi();
|
||||
virtual void init();
|
||||
virtual void setInputting(wchar_t ch);
|
||||
virtual int getCurrentNumPredicted();
|
||||
virtual void getPredicted(int index, wchar_t* string);
|
||||
virtual const wchar_t* getCurrentSelected();
|
||||
virtual u16 getInputStringLength();
|
||||
virtual void setSelectedCandidate(s32 index);
|
||||
virtual bool isFix();
|
||||
virtual void setPredictLaunguage(PredictLanguage language);
|
||||
virtual void changeLetterMode(LetterMode mode);
|
||||
virtual void ChangeDictionaryLanguage(u8 language);
|
||||
virtual void setCellPhoneHoldingkey(void* key);
|
||||
virtual void setElementBuffer();
|
||||
virtual u8 getPredictLanguage();
|
||||
s32 getSelectedCandidateIndex() const { return mSelectedCandidate; }
|
||||
void openDictionary(void* ziDict, void* ziOemDict);
|
||||
void setCurrentWord(const wchar_t* string);
|
||||
void update();
|
||||
const wchar_t* getCurrentInput();
|
||||
void getCurrentInput(wchar_t* buffer, u32 length);
|
||||
void clearCandidates();
|
||||
void partialConfirmForKR();
|
||||
private:
|
||||
EZTXGetParam mSearch;
|
||||
u32 mSearchState;
|
||||
bool mbDictionaryOpen;
|
||||
bool mbContextChanged;
|
||||
u32 mCurrentWordLength;
|
||||
EZTXLanguageEntry* mpDictionaries;
|
||||
void* mpDictionaryWork;
|
||||
u16 mInputLength;
|
||||
s32 mCandidateCount;
|
||||
u32 mOemDictionaryId;
|
||||
u8 mDictionaryLanguage;
|
||||
s32 mSelectedCandidate;
|
||||
u32 mPredictLanguage;
|
||||
u32 mLetterMode;
|
||||
void* mpHoldingKey;
|
||||
};
|
||||
#else
|
||||
class WithZi {
|
||||
public:
|
||||
virtual ~WithZi();
|
||||
|
||||
void openDictionary(void* ziDict, void* ziOemDict);
|
||||
};
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
61
tools/decomp-assist/tiInputForm.attempts.md
Normal file
61
tools/decomp-assist/tiInputForm.attempts.md
Normal file
@@ -0,0 +1,61 @@
|
||||
# tiInputForm attempts
|
||||
|
||||
Target: 4.3U, `src/keyboard/tiInputForm`. Initial gate: 175/221 instruction-exact, objdiff 176/221, code 19124/50656, data 864/3772. All shared-header changes use `TIINPUTFORM_IMPLEMENTATION`, defined only in this source file.
|
||||
|
||||
- `DeadKeyStream::ToCombineClass`: translated the original switch and per-language comparisons. First build: 69/69 instructions, zero differences. `ToIndependentClass` now uses its real static member declaration; 30/30, zero differences.
|
||||
- `RowInfoManager::init`: direct references produced 40/39 instructions. A cached last-row index and array pointer produced 38/39. Widening the index and narrowing only the array subscript retained 38/39. Restored the original asm to avoid regression. The remaining difference includes a repeated maximum-length load and indexing/store scheduling.
|
||||
- `Base::~Base`: restored the row-manager destructor and the real C++ destructor. First build: 29/29, zero differences. This also restores twelve exact inheritance thunks.
|
||||
- `LayoutByNW4R::~LayoutByNW4R`: used the sibling event handler and animation list, with explicit event-handler destruction and allocator release. First successful build: 77/77, zero differences. This restores ten additional exact inheritance thunks.
|
||||
- `Base::calcCursorTimer`, `dirtyCacheAll`, `setCursorPos`, `setAtokDictionary`, `closeAtokDictionary`, `isAtokDictionaryOpened`, `getCursorPos`, and `LayoutByNW4R::isAbleToUp`/`isAbleToDown`: converted existing asm into real members. Each first build was instruction-exact. `getCursorPos` is 27/27 instructions with zero differences.
|
||||
- `Base::isAtokActive`: early false return: 10/10 instructions, seven differences in branch direction/block order. A result variable: 10/10, eight differences. Positive conditional return: 10/10, seven differences. Boolean switch: 11/10. Restored the original asm to avoid regression.
|
||||
- `NormalButtonAnmPane::onAnmEvent`: added the missing state-machine member. Natural numeric case order gave 147/147 instructions with 23 differences in switch-block order. Ordering the cases as the target emits them gave 147/147, zero differences.
|
||||
- `Base::calcCursorPos`: direct translation with the empty-input recursion at the loop head gave 329/326 instructions and an oversized frame. Moving the empty-input handling after the loop gave 332/326. Reducing DrawInfo to its actual rectangle and character fields and introducing scalar scale components gave 323/326. Restoring aggregate scale and initializing line bottom beside line top gave 332/326. Qualifying recursive calls as Base calls and matching comparison operand direction gave 326/326, with 81 differences in floating-point allocation and scheduling. This implementation remains partial.
|
||||
- `LayoutByNW4R::updateInput`: direct translation gave 155/154 instructions. Inverting the midpoint branch gave 154/154 with five operand-order differences. Reordering commutative expressions did not change those five differences. Dividing the height by two and using separate bottom-position temporaries reduced this to three. Correcting the bottom expression to add height and origin before adding one gave 154/154, zero differences.
|
||||
|
||||
Every measured state retained the original 20-string pool. The first gate lacked its current merge-base baseline; the baseline became available during the run. Subsequent quick gates passed with zero regressions and zero forbidden/readability additions. The unit remains NonMatching.
|
||||
|
||||
- `Base::isOverRowLimit`: direct glyph/row walk gave 239/238 instructions. Separating scale construction from assignment and adding an explicit null pointer initialization gave 241/238. Restoring aggregate initialization and arranging the cursor/scale temporaries gave 236/238; the retained implementation has an undersized frame plus floating-point scheduling/register differences.
|
||||
- `LayoutByNW4R::onCommand`: translated the length trimming and row-limit handling. Reusing one limit variable, introducing a separate trim limit, then separating the excess position reached 251/251 instructions with 17 differences. Calling the existing inline observer method emitted an additional `OutOfLength` string. Declaring it out of line and placing its real definition at the existing string position emitted a vtable and an additional `Cancel!` string. Restored the original state; the candidate is not included because its pool did not pass.
|
||||
- `RowInfoManager::init`: a fourth attempt using a typed row accessor still gave 38/39 instructions. Restored the original asm.
|
||||
- `Animation::startAnm`, `getValue`, `isActive`, `setSEFlag`, `isSEFlag`, `stop`: translated into their real class members; each is instruction-exact. `Animation::calc`: reversing the commutative increment expression matches the original raw 33-instruction bytes. ctxdiff still prints two differing CR1 branch offsets; its disassembly normalization depends on each object's function offset. This is a tooling discrepancy, not an instruction-count claim.
|
||||
- Static colors: restored the seven actual color objects and their constructors. Their compiler-generated initializer is 83/87 instructions. The target also registers a real LayoutGather singleton in the still-missing command handler and dynamically initializes an animation table pointer. Those missing objects account for destructor-chain offsets and the final four instructions. No artificial placement was added.
|
||||
- `LayoutByNW4R::getScale`: root-pane lookup using the existing layout and pane headers. First build: 18/18 instructions, zero differences.
|
||||
- `WithAtok`: replaced 36 existing no-op/constant-return asm methods with C++ bodies reproducing the original disabled Atok implementation. Also converted the original no-op `Decolated::EnableKSXFilter` and `deleteChar`. Corrected the confirmed-string getter's const qualifier. The fresh gate retains 199/221 instruction-exact functions, with zero regressions; these conversions improve source quality rather than function counts.
|
||||
- `Base::checkHeadOfSentence`: translated the observer command, previous-character switch, cursor move and sentence check. First build: 71/71 instructions, zero differences.
|
||||
- `Base::isOverLine`: aggregate scale locals gave 55/51 instructions due to duplicate temporary copies. Scalar scale values gave 59/51 with four saved floating-point registers. A single return expression gave 43/51 by delaying width loads. Const references retained 55/51; separate scale assignments gave 59/51. Restored the existing exact asm body.
|
||||
|
||||
- `Base::isEditMode`: a direct Boolean range and tail return gave 13/22 instructions. Switching on the two direct-edit prediction modes and explicitly testing the Zi fix state gave 22/22, zero differences.
|
||||
- `Base::onPressUp` and `onPressDown`: literal translation gave 245/246 instructions. Reversing pointer comparison operands, preserving the current-string call result in a separate local, and making the prediction test positive reduced the differences to the final kana branch. An explicit common exit retained 245/246. Boolean switches with the false case first gave 247/246; the true case first gave 246/246 with only the comparison constant and branch polarity differing. A negated switch gave 247/246 and changed register allocation. Restored the readable 245/246 version; the target retains one extra unconditional branch. Guarded sibling headers expose actual Zi methods, candidate text area, and the hardware keyboard's single/double quote state.
|
||||
- `Base::onPressDownHWKB`: initial nested conversion-first handling gave 266/270 with large block-order differences. Putting the modifier-driven commit before candidate navigation retained 266/270 and aligned the blocks. Hoisting the selected index and splitting the kana/candidate tests retained 266/270. The retained partial has one conditional branch difference, selected-index register allocation, and an original trailing Zi comparison whose no-op body is not reconstructed.
|
||||
- `Base::onCursor`: literal candidate/kana drawing gave 475/473 instructions. Combining selection flags, ordering rectangle assignments and explicitly calculating box coordinates gave 473/473 with 22 differences. Reordering color branches and centering widths gave 473/473 with seven differences. Separate font-height temporaries regressed to 475/473. Using direct cursor-height call expressions restored 473/473 with five differences, confined to the centered-space calculation's floating-point registers and commutative operand order. Retained the best real C++ implementation, including genuine candidate/kana background colors and typed drawer fields.
|
||||
|
||||
- `Base::onPressLeftHWKB` and `onPressRightHWKB`: initial typed translation gave 263/264 and 274/275 instructions. Using the target's nonpositive candidate-count test and placing the active-conversion block first removed the remaining block-order differences. A true-case Boolean switch gave 264/264 and 275/275, each with two differences: compare-to-one/branch-equal instead of compare-to-zero/branch-not-equal. Retained this source variant. Zi's selected-candidate access uses the actual class state and the SDK's EZTXGetParam, guarded for this source; the selected field load agrees with the target at 0x98. The extra search-state word at 0x74 is present in the original 0x2c cleared parameter range but its precise semantics remain uncertain.
|
||||
|
||||
- `Base::toggleAtokMode_`: first typed translation gave 154/154 with 56 differences. Inverting the toolbar permission condition, placing active-candidate handling first, and putting mode-enable handling first gave 154/154, zero differences. The sibling PC header omitted its original allocator at 0x38; exposing that field only under this unit's macro places the original QWERTY/language flags at 0x3c/0x3d. Guarding KeyboardBase's existing two-argument onKey signature prevents an extra virtual slot.
|
||||
- `Base::onHKBCtrlCode`: numeric case order gave 375/375 with 314 differences. Reordering the cases to their original emitted order reduced this to two range-test differences. Writing the inclusive CN/KR range as an unsigned difference <= 1 gave 375/375, zero differences.
|
||||
|
||||
- `Base::inputCharZi_`: direct translation gave 163/166 instructions. Explicitly setting the direct-input Boolean, placing the Korean alphabet branch first, and reordering letter-mode cases gave 166/166 with seven block-order differences. Ordering letter-mode cases as lower, upper, default gave 166/166, zero differences.
|
||||
- `Base::confirmInputting_`: direct translation gave 345/346 instructions with the direct-input block emitted last. Moving that block first aligned the remaining code; inclusive input and prediction-length comparisons remove two comparison differences. Factoring an unconfirmed Boolean gave 349/346; two separate pointer predicates gave 347/346. Retaining the original else-if chain and its repeated unconfirmed-pointer predicate gave 346/346 and byte-identical raw text (1384 bytes). ctxdiff reports two CR1 offsets because of its disassembly normalization; objdiff is the authority for this function's score.
|
||||
|
||||
- `Base::inputCharDefault_`: literal C++ restored from asm: 135/135, 14 differences. Correct cursor-query calls, positive prediction branch, and local declaration order: 135/135, diffs 0.
|
||||
- `Base::onSpaceKeyHWKB`: literal C++ plus semantic dead-key compatibility filter: 592/603. Original candidate/body order, inline context reset, explicit Atok boolean, and bottom-tested input loops: 603/603, 21 differences. Active-string temporary and positive boolean branch: 603/603, seven differences. Boolean switch: 607/603. Retained 603/603; seven differences are the Atok boolean block order only. Pool identical; filter loop and both candidate cycling bodies are instruction exact.
|
||||
|
||||
- `LayoutByNW4R::init`: qualified Layout calls: 136/151. Virtual dispatch restored: 151/151, diffs 0; pool identical. Text-drawer fields reconstructed at original offsets with no sibling output changes.
|
||||
- `EventHandler::onTiEvent`: literal event dispatch: 423/419. Hoisted animation buffer and ordinary fallback literal: 420/419, but pool gains an extra `T_2l_TextBox`. Pane-name load before cursor initialization and existing base-pane field as fallback: 423/419, 96.10501%; pool identical. Remaining string-base addressing, register allocation, and fallback load differ; retained complete readable implementation.
|
||||
|
||||
- `LayoutByNW4R` constructor: real initializer list replaces asm: 46/46, diffs 0.
|
||||
- `LayoutByNW4R::setLanguage`: literal helper: 234/237, extra inline-helper string pool. Expanded queries: 240/237, cached base-subobject register. Const pane-query helper: 237/237, 22 scheduling differences. Conditional argument form: same 22. Fallback passed into a string helper: 237/237, 64 differences. Retained const pane-query helper with pool identical.
|
||||
- `EventHandler::onTiEvent`: ordinary fallback literal shared with restored constructor, pane-query reference, event-case order, inclusive repeat threshold: 419/419, five differences, all string offsets. Original table data before the second string group is still missing.
|
||||
- `LayoutByNW4R::create`: literal calls to Base create: 303/356. Inlined row-list allocation and selection, real animation records, font and event handler setup: 358/356. Correct EditBuffer virtual layout and full-width outer button loop: 359/356. Pool identical. Remaining register allocation, row-list scheduling and loop lowering; complete implementation retained. Corrected missing eighth animation file pointers in both actual button records. Removed legacy duplicate font/assert string objects; ordinary literals now emit them.
|
||||
|
||||
- `Base::onCommand`: complete C++ dispatcher, real command payloads and Zi/dead-key/context helpers: 2038/2053, 87.37506%. Correct boolean delete-forward result, initialized saved translation mode, explicit Atok predicate: 2053/2053. Cached fixed-string selection across commands: 2056/2053; retained with gate passing. Remaining stack-frame layout (0x280 vs 0x250), register allocation, predicate lowering and case scheduling. Moved the hardware-control dispatcher before layout strings; its real jump table plus the new command jump tables fix all five event-handler offsets (419/419, diffs 0).
|
||||
|
||||
- `LayoutByNW4R::onCommand`: after restoring the constructor/ordinary literal pool, removing its legacy duplicate OutOfLength object allows the existing observer method to emit the real string. The earlier complete candidate is now pool-identical (251/251, 17 differences). Scope the trim limit inside the default branch, compare length on the left, and initialize the row-limit payload before its nonzero test: 251/251, diffs 0.
|
||||
- `__sinit_\tiInputForm_cpp`: reconstructed the actual down-button binding target from the original final initializer store (table offset 0x4c): its animation files target the up-button pane. Using that real mutable target pointer in the down-button record emits the original dynamic initialization. 87/87, diffs 0. This object has a real runtime role, not a placement role.
|
||||
- Cursor-cache symbol: restored `textdrawer::Base::isEnableCursorCache() const` and `getStartPos() const` from actual typed state. The report names the former by concatenating its mangled name with the latter. Direct bool return: raw 8 bytes `886301044e800020`, identical to the malformed original entry. Positive branch: same 8 bytes. Comparison to false: 20 bytes. Retained direct return; exact-name gate still cannot pair it with the malformed report symbol. `getStartPos`: 2/2, diffs 0. No function/config aliases were added.
|
||||
|
||||
- Small accessor conversion: removed 22 asm bodies in favor of existing real header definitions or typed C++ members (StringBase, Decolated, WithZi, Manager, CandidateBox and text-drawer cache state). Fresh gate: 208/221 objdiff exact, 206/221 instruction-exact, zero baseline regressions. Draw-cache getter 8/8, dirty cache 3/3, Zi candidate-count getter 2/2, string length getter 2/2, all diffs 0. Reconstructed draw/cache fields from their original loads and preserved the nested CommandReceiver::Scroll signature under the unit macro.
|
||||
|
||||
- `Base::onCursor`: final centered-space variation initializes the real offset before width locals and puts scale/half-width operands first: 473/473, seven differences. Restored the five-difference version.
|
||||
|
||||
- Final clean full gate: GATE PASS; pool IDENTICAL; instruction-exact 206/221 (baseline 175/221); objdiff functions 208/221 (baseline 176/221); code 28300/50656 (baseline 19124/50656); data 868/3772 (baseline 864/3772); zero regressions, forbidden additions and readability warnings. Full build passes and DOL SHA1 is 26116613f624061ba99c8d1a299aaa6efa85670d. Partial result: 46 existing asm bodies remain and data is below 100%. Every remaining report-nonmatching entry has at least three logged source-level attempts.
|
||||
Reference in New Issue
Block a user