Rename keyboard mappings to avoid conflict. Rename more functions.

Mysticial · Mysticial · commit 684cf0420102 · 2025-12-13T20:31:27.000-08:00
diff --git a/SerialPrograms/Source/ControllerInput/ControllerInput.h b/SerialPrograms/Source/ControllerInput/ControllerInput.h
@@ -44,7 +44,7 @@ class ControllerInputState{
 
 
 struct ControllerInputListener{
-    virtual void controller_input_state(ControllerInputState& state){}
+    virtual void run_controller_input(ControllerInputState& state){}
 };
 
 
diff --git a/SerialPrograms/Source/ControllerInput/Keyboard/GlobalKeyboardHidTracker.cpp b/SerialPrograms/Source/ControllerInput/Keyboard/GlobalKeyboardHidTracker.cpp
@@ -164,7 +164,7 @@ void KeyboardHidTracker::thread_loop(){
 
                 //  If state is neutral, just issue a stop.
                 if (neutral){
-                    m_listeners.run_method(&ControllerInputListener::controller_input_state, current);
+                    m_listeners.run_method(&ControllerInputListener::run_controller_input, current);
 //                    cancel_all_commands();
                     last.clear();
                     last_neutral = true;
@@ -180,7 +180,7 @@ void KeyboardHidTracker::thread_loop(){
 
                 //  Send the command.
 //                cout << "send_state()" << endl;
-                m_listeners.run_method(&ControllerInputListener::controller_input_state, current);
+                m_listeners.run_method(&ControllerInputListener::run_controller_input, current);
 //                send_state(*current);
 
                 std::swap(last, current);
diff --git a/SerialPrograms/Source/Controllers/Controller.h b/SerialPrograms/Source/Controllers/Controller.h
@@ -194,10 +194,10 @@ class AbstractController{
 public:
     //  Controller Input
 
-    virtual void controller_input_state(const ControllerInputState& state){}
+    virtual void run_controller_input(const ControllerInputState& state){}
 
-    virtual void add_keyboard_listener(KeyboardEventHandler::KeyboardListener& keyboard_listener){};
-    virtual void remove_keyboard_listener(KeyboardEventHandler::KeyboardListener& keyboard_listener){};
+    virtual void add_input_sniffer(KeyboardEventHandler::KeyboardListener& listener){};
+    virtual void remove_input_sniffer(KeyboardEventHandler::KeyboardListener& listener){};
 };
 
 
diff --git a/SerialPrograms/Source/Controllers/StandardHid/StandardHid_Keyboard.cpp b/SerialPrograms/Source/Controllers/StandardHid/StandardHid_Keyboard.cpp
@@ -111,7 +111,7 @@ Keyboard::~Keyboard(){
 }
 
 
-void Keyboard::controller_input_state(const ControllerInputState& state){
+void Keyboard::run_controller_input(const ControllerInputState& state){
 
     if (state.type() != ControllerInputType::HID_Keyboard){
         return;
diff --git a/SerialPrograms/Source/Controllers/StandardHid/StandardHid_Keyboard.h b/SerialPrograms/Source/Controllers/StandardHid/StandardHid_Keyboard.h
@@ -61,7 +61,7 @@ class Keyboard : public AbstractController{
 public:
     //  Controller Input
 
-    virtual void controller_input_state(const ControllerInputState& state) override;
+    virtual void run_controller_input(const ControllerInputState& state) override;
 
 
 private:
diff --git a/SerialPrograms/Source/NintendoSwitch/Controllers/Joycon/NintendoSwitch_Joycon.cpp b/SerialPrograms/Source/NintendoSwitch/Controllers/Joycon/NintendoSwitch_Joycon.cpp
@@ -49,8 +49,8 @@ JoyconController::JoyconController(Logger& logger, ControllerClass controller_cl
 {
     std::vector<std::shared_ptr<EditableTableRow>> mapping =
         controller_class == ControllerClass::NintendoSwitch_LeftJoycon
-            ? ConsoleSettings::instance().KEYBOARD_MAPPINGS.LEFT_JOYCON.current_refs()
-            : ConsoleSettings::instance().KEYBOARD_MAPPINGS.RIGHT_JOYCON.current_refs();
+            ? ConsoleSettings::instance().KEYBOARD_MAPPINGS.LEFT_JOYCON2.current_refs()
+            : ConsoleSettings::instance().KEYBOARD_MAPPINGS.RIGHT_JOYCON2.current_refs();
 
     for (const auto& deltas : mapping){
         const JoyconFromKeyboardTableRow& row = static_cast<const JoyconFromKeyboardTableRow&>(*deltas);
@@ -60,7 +60,7 @@ JoyconController::JoyconController(Logger& logger, ControllerClass controller_cl
 JoyconController::~JoyconController(){
 }
 
-void JoyconController::controller_input_state(const ControllerInputState& state){
+void JoyconController::run_controller_input(const ControllerInputState& state){
 
     if (state.type() != ControllerInputType::HID_Keyboard){
         return;
@@ -98,11 +98,11 @@ void JoyconController::controller_input_state(const ControllerInputState& state)
     m_data->m_input_sniffer.report_keyboard_command_sent(timestamp, controller_state);
 }
 
-void JoyconController::add_keyboard_listener(KeyboardEventHandler::KeyboardListener& keyboard_listener){
-    m_data->m_input_sniffer.add_listener(keyboard_listener);
+void JoyconController::add_input_sniffer(KeyboardEventHandler::KeyboardListener& listener){
+    m_data->m_input_sniffer.add_listener(listener);
 }
-void JoyconController::remove_keyboard_listener(KeyboardEventHandler::KeyboardListener& keyboard_listener){
-    m_data->m_input_sniffer.remove_listener(keyboard_listener);
+void JoyconController::remove_input_sniffer(KeyboardEventHandler::KeyboardListener& listener){
+    m_data->m_input_sniffer.remove_listener(listener);
 }
 
 
diff --git a/SerialPrograms/Source/NintendoSwitch/Controllers/Joycon/NintendoSwitch_Joycon.h b/SerialPrograms/Source/NintendoSwitch/Controllers/Joycon/NintendoSwitch_Joycon.h
@@ -166,10 +166,10 @@ class JoyconController : public AbstractController{
 public:
     //  Controller Input
 
-    virtual void controller_input_state(const ControllerInputState& state) override;
+    virtual void run_controller_input(const ControllerInputState& state) override;
 
-    virtual void add_keyboard_listener(KeyboardEventHandler::KeyboardListener& keyboard_listener) override;
-    virtual void remove_keyboard_listener(KeyboardEventHandler::KeyboardListener& keyboard_listener) override;
+    virtual void add_input_sniffer(KeyboardEventHandler::KeyboardListener& listener) override;
+    virtual void remove_input_sniffer(KeyboardEventHandler::KeyboardListener& listener) override;
 
 
 private:
diff --git a/SerialPrograms/Source/NintendoSwitch/Controllers/Joycon/NintendoSwitch_Joycon_from_Keyboard.cpp b/SerialPrograms/Source/NintendoSwitch/Controllers/Joycon/NintendoSwitch_Joycon_from_Keyboard.cpp
@@ -120,7 +120,7 @@ JoyconFromKeyboardTableRow::JoyconFromKeyboardTableRow(EditableTableOption& pare
     , joystick_y(LockMode::UNLOCK_WHILE_RUNNING, 0, -1, 1)
 {
     add_option(label, "Description");
-    add_option(key, "Key");
+    add_option(key, "HID ID");
     add_option(buttons, "Button Bit-Field");
     add_option(joystick_x, "Joystick x");
     add_option(joystick_y, "Joystick y");
diff --git a/SerialPrograms/Source/NintendoSwitch/Controllers/NintendoSwitch_KeyboardMapping.cpp b/SerialPrograms/Source/NintendoSwitch/Controllers/NintendoSwitch_KeyboardMapping.cpp
@@ -43,14 +43,14 @@ KeyboardMappingOption::KeyboardMappingOption()
         LockMode::UNLOCK_WHILE_RUNNING,
         false
     )
-    , LEFT_JOYCON(true)
-    , RIGHT_JOYCON(false)
+    , LEFT_JOYCON2(true)
+    , RIGHT_JOYCON2(false)
 {
     PA_ADD_STATIC(DESCRIPTION);
     PA_ADD_OPTION(ADVANCED_MODE);
-    PA_ADD_OPTION(PRO_CONTROLLER);
-    PA_ADD_OPTION(LEFT_JOYCON);
-    PA_ADD_OPTION(RIGHT_JOYCON);
+    PA_ADD_OPTION(PRO_CONTROLLER2);
+    PA_ADD_OPTION(LEFT_JOYCON2);
+    PA_ADD_OPTION(RIGHT_JOYCON2);
     ADVANCED_MODE.add_listener(*this);
 }
 
@@ -60,9 +60,9 @@ void KeyboardMappingOption::load_json(const JsonValue& json){
     KeyboardMappingOption::on_config_value_changed(this);
 }
 void KeyboardMappingOption::on_config_value_changed(void* object){
-    PRO_CONTROLLER.set_advanced_mode(ADVANCED_MODE);
-    LEFT_JOYCON.set_advanced_mode(ADVANCED_MODE);
-    RIGHT_JOYCON.set_advanced_mode(ADVANCED_MODE);
+    PRO_CONTROLLER2.set_advanced_mode(ADVANCED_MODE);
+    LEFT_JOYCON2.set_advanced_mode(ADVANCED_MODE);
+    RIGHT_JOYCON2.set_advanced_mode(ADVANCED_MODE);
 }
 
 
diff --git a/SerialPrograms/Source/NintendoSwitch/Controllers/NintendoSwitch_KeyboardMapping.h b/SerialPrograms/Source/NintendoSwitch/Controllers/NintendoSwitch_KeyboardMapping.h
@@ -31,9 +31,9 @@ class KeyboardMappingOption : public BatchOption, private ConfigOption::Listener
 public:
     StaticTextOption DESCRIPTION;
     BooleanCheckBoxOption ADVANCED_MODE;
-    ProControllerFromKeyboardTable PRO_CONTROLLER;
-    JoyconFromKeyboardTable LEFT_JOYCON;
-    JoyconFromKeyboardTable RIGHT_JOYCON;
+    ProControllerFromKeyboardTable PRO_CONTROLLER2;
+    JoyconFromKeyboardTable LEFT_JOYCON2;
+    JoyconFromKeyboardTable RIGHT_JOYCON2;
 };
 
 
diff --git a/SerialPrograms/Source/NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.cpp b/SerialPrograms/Source/NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.cpp
@@ -47,7 +47,7 @@ ProController::ProController(Logger& logger)
     : m_data(CONSTRUCT_TOKEN)
 {
     std::vector<std::shared_ptr<EditableTableRow>> mapping =
-        ConsoleSettings::instance().KEYBOARD_MAPPINGS.PRO_CONTROLLER.current_refs();
+        ConsoleSettings::instance().KEYBOARD_MAPPINGS.PRO_CONTROLLER2.current_refs();
 
     for (const auto& deltas : mapping){
         const ProControllerFromKeyboardTableRow& row = static_cast<const ProControllerFromKeyboardTableRow&>(*deltas);
@@ -61,8 +61,8 @@ ControllerClass ProController::controller_class() const{
     return ControllerClass::NintendoSwitch_ProController;
 }
 
-void ProController::controller_input_state(const ControllerInputState& state){
-//    cout << "controller_input_state()" << endl;
+void ProController::run_controller_input(const ControllerInputState& state){
+//    cout << "run_controller_input()" << endl;
 
     if (state.type() != ControllerInputType::HID_Keyboard){
         return;
@@ -103,11 +103,11 @@ void ProController::controller_input_state(const ControllerInputState& state){
     m_data->m_input_sniffer.report_keyboard_command_sent(timestamp, controller_state);
 }
 
-void ProController::add_keyboard_listener(KeyboardEventHandler::KeyboardListener& keyboard_listener){
-    m_data->m_input_sniffer.add_listener(keyboard_listener);
+void ProController::add_input_sniffer(KeyboardEventHandler::KeyboardListener& listener){
+    m_data->m_input_sniffer.add_listener(listener);
 }
-void ProController::remove_keyboard_listener(KeyboardEventHandler::KeyboardListener& keyboard_listener){
-    m_data->m_input_sniffer.remove_listener(keyboard_listener);
+void ProController::remove_input_sniffer(KeyboardEventHandler::KeyboardListener& listener){
+    m_data->m_input_sniffer.remove_listener(listener);
 }
 
 
diff --git a/SerialPrograms/Source/NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h b/SerialPrograms/Source/NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h
@@ -221,10 +221,10 @@ class ProController : public AbstractController{
 public:
     //  Controller Input
 
-    virtual void controller_input_state(const ControllerInputState& state) override;
+    virtual void run_controller_input(const ControllerInputState& state) override;
 
-    virtual void add_keyboard_listener(KeyboardEventHandler::KeyboardListener& keyboard_listener) override;
-    virtual void remove_keyboard_listener(KeyboardEventHandler::KeyboardListener& keyboard_listener) override;
+    virtual void add_input_sniffer(KeyboardEventHandler::KeyboardListener& listener) override;
+    virtual void remove_input_sniffer(KeyboardEventHandler::KeyboardListener& listener) override;
 
 private:
     struct Data;
diff --git a/SerialPrograms/Source/NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController_from_Keyboard.cpp b/SerialPrograms/Source/NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController_from_Keyboard.cpp
@@ -96,7 +96,7 @@ ProControllerFromKeyboardTableRow::ProControllerFromKeyboardTableRow(EditableTab
     , right_stick_y(LockMode::UNLOCK_WHILE_RUNNING, 0, -1, 1)
 {
     add_option(label, "Description");
-    add_option(key, "Key");
+    add_option(key, "HID ID");
     add_option(buttons, "Button Bit-Field");
     add_option(dpad_x, "Dpad x");
     add_option(dpad_y, "Dpad y");
diff --git a/SerialPrograms/Source/NintendoSwitch/Framework/UI/NintendoSwitch_CommandRow.cpp b/SerialPrograms/Source/NintendoSwitch/Framework/UI/NintendoSwitch_CommandRow.cpp
@@ -180,7 +180,7 @@ CommandRow::CommandRow(
     m_controller.add_listener(*this);
 }
 
-void CommandRow::controller_input_state(ControllerInputState& state){
+void CommandRow::run_controller_input(ControllerInputState& state){
     if (!m_last_known_focus){
         m_controller.logger().log("Keyboard Command Suppressed: Not in focus.", COLOR_RED);
         return;
@@ -194,7 +194,7 @@ void CommandRow::controller_input_state(ControllerInputState& state){
         m_controller.logger().log("Keyboard Command Suppressed: Program is running.", COLOR_RED);
         return;
     }
-    controller->controller_input_state(state);
+    controller->run_controller_input(state);
 }
 void CommandRow::set_focus(bool focused){
     if (focused){
diff --git a/SerialPrograms/Source/NintendoSwitch/Framework/UI/NintendoSwitch_CommandRow.h b/SerialPrograms/Source/NintendoSwitch/Framework/UI/NintendoSwitch_CommandRow.h
@@ -54,7 +54,7 @@ class CommandRow :
     void on_state_changed(ProgramState state);
 
 private:
-    virtual void controller_input_state(ControllerInputState& state) override;
+    virtual void run_controller_input(ControllerInputState& state) override;
 
     virtual void on_overlay_enabled_stats  (bool enabled) override;
     virtual void on_overlay_enabled_boxes  (bool enabled) override;
diff --git a/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_RecordKeyboardController.cpp b/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_RecordKeyboardController.cpp
@@ -97,7 +97,7 @@ void RecordKeyboardController::program(SingleSwitchProgramEnvironment& env, Canc
             throw FileException(nullptr, PA_CURRENT_FUNCTION, "Given file name already exists. Choose a different file name.", output_json_filename);
         }
 
-        context.controller().add_keyboard_listener(*this);
+        context.controller().add_input_sniffer(*this);
 
         try{
             context.wait_until_cancel();
@@ -111,7 +111,7 @@ void RecordKeyboardController::program(SingleSwitchProgramEnvironment& env, Canc
                 json_to_cpp_code(env.console.logger(), json, FILE_NAME);
             }
 
-            context.controller().remove_keyboard_listener(*this);
+            context.controller().remove_input_sniffer(*this);
             
             throw;
         }        

Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,7 @@ Keyboard::~Keyboard(){`
`111`	`111`	`}`
`112`	`112`
`113`	`113`
`114`		`-void Keyboard::controller_input_state(const ControllerInputState& state){`
	`114`	`+void Keyboard::run_controller_input(const ControllerInputState& state){`
`115`	`115`
`116`	`116`	`if (state.type() != ControllerInputType::HID_Keyboard){`
`117`	`117`	`return;`
Original file line number	Diff line number	Diff line change
`@@ -49,8 +49,8 @@ JoyconController::JoyconController(Logger& logger, ControllerClass controller_cl`
`49`	`49`	`{`
`50`	`50`	`std::vector<std::shared_ptr<EditableTableRow>> mapping =`
`51`	`51`	`controller_class == ControllerClass::NintendoSwitch_LeftJoycon`
`52`		`- ? ConsoleSettings::instance().KEYBOARD_MAPPINGS.LEFT_JOYCON.current_refs()`
`53`		`- : ConsoleSettings::instance().KEYBOARD_MAPPINGS.RIGHT_JOYCON.current_refs();`
	`52`	`+ ? ConsoleSettings::instance().KEYBOARD_MAPPINGS.LEFT_JOYCON2.current_refs()`
	`53`	`+ : ConsoleSettings::instance().KEYBOARD_MAPPINGS.RIGHT_JOYCON2.current_refs();`
`54`	`54`
`55`	`55`	`for (const auto& deltas : mapping){`
`56`	`56`	`const JoyconFromKeyboardTableRow& row = static_cast<const JoyconFromKeyboardTableRow&>(*deltas);`
`@@ -60,7 +60,7 @@ JoyconController::JoyconController(Logger& logger, ControllerClass controller_cl`
`60`	`60`	`JoyconController::~JoyconController(){`
`61`	`61`	`}`
`62`	`62`
`63`		`-void JoyconController::controller_input_state(const ControllerInputState& state){`
	`63`	`+void JoyconController::run_controller_input(const ControllerInputState& state){`
`64`	`64`
`65`	`65`	`if (state.type() != ControllerInputType::HID_Keyboard){`
`66`	`66`	`return;`
`@@ -98,11 +98,11 @@ void JoyconController::controller_input_state(const ControllerInputState& state)`
`98`	`98`	`m_data->m_input_sniffer.report_keyboard_command_sent(timestamp, controller_state);`
`99`	`99`	`}`
`100`	`100`
`101`		`-void JoyconController::add_keyboard_listener(KeyboardEventHandler::KeyboardListener& keyboard_listener){`
`102`		`- m_data->m_input_sniffer.add_listener(keyboard_listener);`
	`101`	`+void JoyconController::add_input_sniffer(KeyboardEventHandler::KeyboardListener& listener){`
	`102`	`+ m_data->m_input_sniffer.add_listener(listener);`
`103`	`103`	`}`
`104`		`-void JoyconController::remove_keyboard_listener(KeyboardEventHandler::KeyboardListener& keyboard_listener){`
`105`		`- m_data->m_input_sniffer.remove_listener(keyboard_listener);`
	`104`	`+void JoyconController::remove_input_sniffer(KeyboardEventHandler::KeyboardListener& listener){`
	`105`	`+ m_data->m_input_sniffer.remove_listener(listener);`
`106`	`106`	`}`
`107`	`107`
`108`	`108`
Original file line number	Diff line number	Diff line change
`@@ -120,7 +120,7 @@ JoyconFromKeyboardTableRow::JoyconFromKeyboardTableRow(EditableTableOption& pare`
`120`	`120`	`, joystick_y(LockMode::UNLOCK_WHILE_RUNNING, 0, -1, 1)`
`121`	`121`	`{`
`122`	`122`	`add_option(label, "Description");`
`123`		`- add_option(key, "Key");`
	`123`	`+ add_option(key, "HID ID");`
`124`	`124`	`add_option(buttons, "Button Bit-Field");`
`125`	`125`	`add_option(joystick_x, "Joystick x");`
`126`	`126`	`add_option(joystick_y, "Joystick y");`
Original file line number	Diff line number	Diff line change
`@@ -43,14 +43,14 @@ KeyboardMappingOption::KeyboardMappingOption()`
`43`	`43`	`LockMode::UNLOCK_WHILE_RUNNING,`
`44`	`44`	`false`
`45`	`45`	`)`
`46`		`- , LEFT_JOYCON(true)`
`47`		`- , RIGHT_JOYCON(false)`
	`46`	`+ , LEFT_JOYCON2(true)`
	`47`	`+ , RIGHT_JOYCON2(false)`
`48`	`48`	`{`
`49`	`49`	`PA_ADD_STATIC(DESCRIPTION);`
`50`	`50`	`PA_ADD_OPTION(ADVANCED_MODE);`
`51`		`- PA_ADD_OPTION(PRO_CONTROLLER);`
`52`		`- PA_ADD_OPTION(LEFT_JOYCON);`
`53`		`- PA_ADD_OPTION(RIGHT_JOYCON);`
	`51`	`+ PA_ADD_OPTION(PRO_CONTROLLER2);`
	`52`	`+ PA_ADD_OPTION(LEFT_JOYCON2);`
	`53`	`+ PA_ADD_OPTION(RIGHT_JOYCON2);`
`54`	`54`	`ADVANCED_MODE.add_listener(*this);`
`55`	`55`	`}`
`56`	`56`
`@@ -60,9 +60,9 @@ void KeyboardMappingOption::load_json(const JsonValue& json){`
`60`	`60`	`KeyboardMappingOption::on_config_value_changed(this);`
`61`	`61`	`}`
`62`	`62`	`void KeyboardMappingOption::on_config_value_changed(void* object){`
`63`		`- PRO_CONTROLLER.set_advanced_mode(ADVANCED_MODE);`
`64`		`- LEFT_JOYCON.set_advanced_mode(ADVANCED_MODE);`
`65`		`- RIGHT_JOYCON.set_advanced_mode(ADVANCED_MODE);`
	`63`	`+ PRO_CONTROLLER2.set_advanced_mode(ADVANCED_MODE);`
	`64`	`+ LEFT_JOYCON2.set_advanced_mode(ADVANCED_MODE);`
	`65`	`+ RIGHT_JOYCON2.set_advanced_mode(ADVANCED_MODE);`
`66`	`66`	`}`
`67`	`67`
`68`	`68`