Keyboard refactoring, to have same behaviour for test / main Sugarpi

Tom1975 · Sep 29, 2024 · 01b0088 · 01b0088
1 parent ae16161
commit 01b0088
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 8 deletions.
diff --git a/SugarPiWin32/KeyboardHardwareImplemetationWin.cpp b/SugarPiWin32/KeyboardHardwareImplemetationWin.cpp
@@ -5,6 +5,14 @@
 
 KeyboardHardwareImplemetationWin::KeyboardHardwareImplemetationWin(KeyboardPi* keyboard) : keyboard_(keyboard)
 {
+   for (unsigned i = 0; i < MAX_GAMEPADS; i++)
+   {
+      gamepad_active_[i] = nullptr;
+   }
+
+   GamepadDef* def = new GamepadDef(keyboard_lines_);
+   gamepad_list_.push_back(def);
+   gamepad_active_[0] = gamepad_list_[0];
 
 }
 
@@ -23,13 +31,13 @@ void KeyboardHardwareImplemetationWin::UpdatePlugnPlay()
 
 }
 
-#define action(y) action_buttons_  = activated ? (action_buttons_ |y):(action_buttons_&=~y)
+#define action(y) keyboard_->action_buttons_  = activated ? (keyboard_->action_buttons_ |y):(keyboard_->action_buttons_&=~y)
 void KeyboardHardwareImplemetationWin::CodeAction(long keycode, bool activated)
 {
    // todo : hardcoded values
    switch (keycode)
    {
-   case VK_TAB: select_ = activated; action(GamePadButtonSelect); break;
+   case VK_TAB: keyboard_->select_ = activated; action(GamePadButtonSelect); break;
    case VK_SCROLL: gamepad_active_[0]->game_pad_button_start.UpdateMap(0, activated); action(GamePadButtonStart); break;
    case VK_UP: gamepad_active_[0]->game_pad_button_up.UpdateMap(0, activated); action(GamePadButtonUp);  break;
    case VK_DOWN: gamepad_active_[0]->game_pad_button_down.UpdateMap(0, activated); action(GamePadButtonDown); break;

diff --git a/SugarPiWin32/KeyboardHardwareImplemetationWin.h b/SugarPiWin32/KeyboardHardwareImplemetationWin.h
@@ -21,7 +21,8 @@ class KeyboardHardwareImplemetationWin : public KeyboardHardwareImplemetation
       void Presskey(long keyCode);
       void Unpresskey(long keyCode);
 
-   protected:
+      //bool              select_;
+protected:
       void CodeAction(long keycode, bool activated);
 
       KeyboardPi*    keyboard_;
@@ -31,7 +32,6 @@ class KeyboardHardwareImplemetationWin : public KeyboardHardwareImplemetation
       std::vector<GamepadDef*> gamepad_list_;
       GamepadDef* gamepad_active_[MAX_GAMEPADS];
 
-      unsigned int      action_buttons_;
-      bool              select_;
+      //unsigned int      action_buttons_;
 
 };
diff --git a/src/KeyboardPi.cpp b/src/KeyboardPi.cpp
@@ -97,7 +97,7 @@ bool GamepadActionHandler::IsPressed(TGamePadState* state)
 
 void GamepadActionHandler::UpdateMap(unsigned int nDeviceIndex, bool pressed)
 {
-   if (pressed)
+   if (pressed)  
    {
       *line_[nDeviceIndex] &= ~(1<<index_[nDeviceIndex]);
    }

diff --git a/src/KeyboardPi.h b/src/KeyboardPi.h
@@ -41,9 +41,14 @@ class KeyboardPi : public IKeyboardHandler
 
    void LoadGameControllerDB();
 
+   unsigned int      action_buttons_;
+   bool              select_;
+
    //static void GamePadRemovedHandler (CDevice *pDevice, void *pContext);
    static void KeyStatusHandlerRaw (unsigned char ucModifiers, const unsigned char RawKeys[6]);
    //static void KeyboardRemovedHandler (CDevice *pDevice, void *pContext);
+
+
 protected:
 
    KeyboardHardwareImplemetation* hard_imlementation_;
@@ -60,7 +65,6 @@ class KeyboardPi : public IKeyboardHandler
    TGamePadState	   gamepad_state_[MAX_GAMEPADS];
    TGamePadState	   gamepad_state_buffered_[MAX_GAMEPADS];
 
-   unsigned          action_buttons_;
 
    // Keyboard definition
    unsigned char keyboard_lines_ [10];
@@ -69,7 +73,6 @@ class KeyboardPi : public IKeyboardHandler
 
    std::vector<GamepadDef*> gamepad_list_;
    GamepadDef*       gamepad_active_[MAX_GAMEPADS];
-   bool              select_;
 
    struct RawToCPC
    {