Compare commits
1 Commits
cleanup/se
...
agent/bitt
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
fb2b60534b |
@@ -46,7 +46,7 @@ namespace textinput {
|
|||||||
bool updateTappingShift_(input::HKBManager&);
|
bool updateTappingShift_(input::HKBManager&);
|
||||||
#endif
|
#endif
|
||||||
void updateShift(input::HKBManager& hkbManager);
|
void updateShift(input::HKBManager& hkbManager);
|
||||||
void controlKeyTriggeredHandler(input::HKBManager);
|
bool controlKeyTriggeredHandler(input::HKBManager&);
|
||||||
|
|
||||||
Manager *mgr() { return mpManager; }
|
Manager *mgr() { return mpManager; }
|
||||||
|
|
||||||
|
|||||||
@@ -100,15 +100,6 @@ namespace textinput {
|
|||||||
namespace keyboard {
|
namespace keyboard {
|
||||||
|
|
||||||
namespace hwkey {
|
namespace hwkey {
|
||||||
extern "C" void GetTriggeredKeySet__Q39textinput5input10HKBManagerCFv();
|
|
||||||
extern "C" void IsValid__Q49textinput5input10HKBManager6KeySetCFv();
|
|
||||||
extern "C" void GetKey__Q49textinput5input10HKBManager6KeySetCFv();
|
|
||||||
extern "C" void GetNext__Q49textinput5input10HKBManager6KeySetCFv();
|
|
||||||
extern "C" void GetModifierState__Q39textinput5input10HKBManagerCFv();
|
|
||||||
extern "C" bool updateRepeatKey___Q49textinput8keyboard5hwkey10HWKeyboardFRQ39textinput5input10HKBManager();
|
|
||||||
extern "C" bool updateTriggerKey___Q49textinput8keyboard5hwkey10HWKeyboardFRQ39textinput5input10HKBManager();
|
|
||||||
extern "C" bool updateTappingShift___Q49textinput8keyboard5hwkey10HWKeyboardFRQ39textinput5input10HKBManager();
|
|
||||||
extern "C" void updateShift__Q49textinput8keyboard5hwkey10HWKeyboardFRQ39textinput5input10HKBManager();
|
|
||||||
HWKeyboard::HWKeyboard(Manager* manager) : mpManager(manager), field_0x14(0), field_0x15(0), field_0x16(0) {
|
HWKeyboard::HWKeyboard(Manager* manager) : mpManager(manager), field_0x14(0), field_0x15(0), field_0x16(0) {
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -158,139 +149,41 @@ extern const u8 controlKeys[];
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
extern "C" asm bool updateInput__Q49textinput8keyboard5hwkey10HWKeyboardFRQ39textinput5input10HKBManager() {
|
inline bool HWKeyboard::controlKeyTriggeredHandler(input::HKBManager& hkbManager) {
|
||||||
nofralloc
|
if ((hkbManager.GetModifierState() & 4) == 0) {
|
||||||
stwu r1, -0x40(r1)
|
return false;
|
||||||
mflr r0
|
}
|
||||||
stw r0, 0x44(r1)
|
input::HKBManager::KeySet currentKeySet;
|
||||||
stw r31, 0x3c(r1)
|
currentKeySet = hkbManager.GetTriggeredKeySet();
|
||||||
mr r31, r4
|
while (currentKeySet.IsValid()) {
|
||||||
stw r30, 0x38(r1)
|
switch (currentKeySet.GetKey()) {
|
||||||
mr r30, r3
|
case 0x28:
|
||||||
lwz r3, 0x10(r3)
|
case 0x58: {
|
||||||
lwz r12, 0(r3)
|
mgr()->getToolBar()->onOK();
|
||||||
lwz r12, 0x84(r12)
|
return true;
|
||||||
mtctr r12
|
}
|
||||||
bctrl
|
case 0x29:
|
||||||
lwz r12, 0(r3)
|
case 0x2A: {
|
||||||
lwz r12, 0xdc(r12)
|
mgr()->getToolBar()->onCancel();
|
||||||
mtctr r12
|
return true;
|
||||||
bctrl
|
}
|
||||||
cmpwi r3, 0
|
default: {
|
||||||
bne updateInput_HWKeyboard_L1
|
currentKeySet = currentKeySet.GetNext();
|
||||||
mr r3, r31
|
break;
|
||||||
bl GetModifierState__Q39textinput5input10HKBManagerCFv
|
}
|
||||||
rlwinm. r0, r3, 0, 0x1d, 0x1d
|
}
|
||||||
bne updateInput_HWKeyboard_L2
|
}
|
||||||
li r0, 0
|
return false;
|
||||||
b updateInput_HWKeyboard_L3
|
}
|
||||||
updateInput_HWKeyboard_L2:
|
|
||||||
li r5, 0
|
bool HWKeyboard::updateInput(input::HKBManager& hkbManager) {
|
||||||
li r0, -1
|
if (!static_cast<signwindow::LayoutByNW4R*>(mgr()->getSignKeyboard())->isActive() &&
|
||||||
stw r5, 8(r1)
|
!controlKeyTriggeredHandler(hkbManager) &&
|
||||||
mr r4, r31
|
!updateRepeatKey_(hkbManager) && !updateTriggerKey_(hkbManager)) {
|
||||||
addi r3, r1, 0x14
|
updateTappingShift_(hkbManager);
|
||||||
stb r5, 0xc(r1)
|
}
|
||||||
stb r0, 0xd(r1)
|
updateShift(hkbManager);
|
||||||
stb r5, 0xe(r1)
|
return false;
|
||||||
sth r5, 0x10(r1)
|
|
||||||
bl GetTriggeredKeySet__Q39textinput5input10HKBManagerCFv
|
|
||||||
lwz r6, 0x14(r1)
|
|
||||||
lbz r5, 0x18(r1)
|
|
||||||
lbz r4, 0x19(r1)
|
|
||||||
lbz r3, 0x1a(r1)
|
|
||||||
lhz r0, 0x1c(r1)
|
|
||||||
stw r6, 8(r1)
|
|
||||||
stb r5, 0xc(r1)
|
|
||||||
stb r4, 0xd(r1)
|
|
||||||
stb r3, 0xe(r1)
|
|
||||||
sth r0, 0x10(r1)
|
|
||||||
b updateInput_HWKeyboard_L4
|
|
||||||
updateInput_HWKeyboard_L5:
|
|
||||||
addi r3, r1, 8
|
|
||||||
bl GetKey__Q49textinput5input10HKBManager6KeySetCFv
|
|
||||||
clrlwi r0, r3, 0x18
|
|
||||||
cmpwi r0, 0x2b
|
|
||||||
bge updateInput_HWKeyboard_L6
|
|
||||||
cmpwi r0, 0x28
|
|
||||||
beq updateInput_HWKeyboard_L7
|
|
||||||
bge updateInput_HWKeyboard_L8
|
|
||||||
b updateInput_HWKeyboard_L9
|
|
||||||
updateInput_HWKeyboard_L6:
|
|
||||||
cmpwi r0, 0x58
|
|
||||||
beq updateInput_HWKeyboard_L7
|
|
||||||
b updateInput_HWKeyboard_L9
|
|
||||||
updateInput_HWKeyboard_L7:
|
|
||||||
lwz r3, 0x10(r30)
|
|
||||||
lwz r12, 0(r3)
|
|
||||||
lwz r12, 0x94(r12)
|
|
||||||
mtctr r12
|
|
||||||
bctrl
|
|
||||||
lwz r12, 0(r3)
|
|
||||||
lwz r12, 0xa0(r12)
|
|
||||||
mtctr r12
|
|
||||||
bctrl
|
|
||||||
li r0, 1
|
|
||||||
b updateInput_HWKeyboard_L3
|
|
||||||
updateInput_HWKeyboard_L8:
|
|
||||||
lwz r3, 0x10(r30)
|
|
||||||
lwz r12, 0(r3)
|
|
||||||
lwz r12, 0x94(r12)
|
|
||||||
mtctr r12
|
|
||||||
bctrl
|
|
||||||
lwz r12, 0(r3)
|
|
||||||
lwz r12, 0xa4(r12)
|
|
||||||
mtctr r12
|
|
||||||
bctrl
|
|
||||||
li r0, 1
|
|
||||||
b updateInput_HWKeyboard_L3
|
|
||||||
updateInput_HWKeyboard_L9:
|
|
||||||
addi r3, r1, 0x20
|
|
||||||
addi r4, r1, 8
|
|
||||||
bl GetNext__Q49textinput5input10HKBManager6KeySetCFv
|
|
||||||
lwz r6, 0x20(r1)
|
|
||||||
lbz r5, 0x24(r1)
|
|
||||||
lbz r4, 0x25(r1)
|
|
||||||
lbz r3, 0x26(r1)
|
|
||||||
lhz r0, 0x28(r1)
|
|
||||||
stw r6, 8(r1)
|
|
||||||
stb r5, 0xc(r1)
|
|
||||||
stb r4, 0xd(r1)
|
|
||||||
stb r3, 0xe(r1)
|
|
||||||
sth r0, 0x10(r1)
|
|
||||||
updateInput_HWKeyboard_L4:
|
|
||||||
addi r3, r1, 8
|
|
||||||
bl IsValid__Q49textinput5input10HKBManager6KeySetCFv
|
|
||||||
cmpwi r3, 0
|
|
||||||
bne updateInput_HWKeyboard_L5
|
|
||||||
li r0, 0
|
|
||||||
updateInput_HWKeyboard_L3:
|
|
||||||
cmpwi r0, 0
|
|
||||||
bne updateInput_HWKeyboard_L1
|
|
||||||
mr r3, r30
|
|
||||||
mr r4, r31
|
|
||||||
bl updateRepeatKey___Q49textinput8keyboard5hwkey10HWKeyboardFRQ39textinput5input10HKBManager
|
|
||||||
cmpwi r3, 0
|
|
||||||
bne updateInput_HWKeyboard_L1
|
|
||||||
mr r3, r30
|
|
||||||
mr r4, r31
|
|
||||||
bl updateTriggerKey___Q49textinput8keyboard5hwkey10HWKeyboardFRQ39textinput5input10HKBManager
|
|
||||||
cmpwi r3, 0
|
|
||||||
bne updateInput_HWKeyboard_L1
|
|
||||||
mr r3, r30
|
|
||||||
mr r4, r31
|
|
||||||
bl updateTappingShift___Q49textinput8keyboard5hwkey10HWKeyboardFRQ39textinput5input10HKBManager
|
|
||||||
updateInput_HWKeyboard_L1:
|
|
||||||
mr r3, r30
|
|
||||||
mr r4, r31
|
|
||||||
bl updateShift__Q49textinput8keyboard5hwkey10HWKeyboardFRQ39textinput5input10HKBManager
|
|
||||||
lwz r31, 0x3c(r1)
|
|
||||||
li r3, 0
|
|
||||||
lwz r30, 0x38(r1)
|
|
||||||
lwz r0, 0x44(r1)
|
|
||||||
mtlr r0
|
|
||||||
addi r1, r1, 0x40
|
|
||||||
blr
|
|
||||||
}
|
}
|
||||||
|
|
||||||
bool HWKeyboard::updateRepeatKey_(input::HKBManager& hkbManager) {
|
bool HWKeyboard::updateRepeatKey_(input::HKBManager& hkbManager) {
|
||||||
|
|||||||
Reference in New Issue
Block a user