Merge pull request #201 from SamoZ256/master

InputCommon: fix keyboards not being listed in devices

Author: OatmealDome

Source/Core/InputCommon/ControllerInterface/iOS/MFiControllerScanner.h

@@ -7,4 +7,6 @@
 
 @interface MFiControllerScanner : NSObject
 
+@property (nonatomic, strong) NSMutableArray* keyboards;
+
 @end

Source/Core/InputCommon/ControllerInterface/iOS/MFiControllerScanner.mm

@@ -15,6 +15,8 @@ - (id)init
 {
   if (self = [super init])
   {
+    _keyboards = [[NSMutableArray alloc] init];
+
     [[NSNotificationCenter defaultCenter] addObserver:self
                                              selector:@selector(controllerConnected:)
                                                  name:GCControllerDidConnectNotification
@@ -61,6 +63,7 @@ - (void)keyboardConnected:(NSNotification*)notification
 {
   GCKeyboard* keyboard = (GCKeyboard*)notification.object;
   g_controller_interface.AddDevice(std::make_shared<ciface::iOS::MFiKeyboard>(keyboard));
+  [_keyboards addObject:keyboard];
 }
 
 - (void)keyboardDisconnected:(NSNotification*)notification
@@ -70,6 +73,7 @@ - (void)keyboardDisconnected:(NSNotification*)notification
         dynamic_cast<const ciface::iOS::MFiKeyboard*>(device);
     return keyboard != nullptr;
   });
+  [_keyboards removeObject:notification.object];
 }
 
 @end

Source/Core/InputCommon/ControllerInterface/iOS/iOS.mm

@@ -5,6 +5,7 @@
 
 #include "InputCommon/ControllerInterface/iOS/MFiController.h"
 #include "InputCommon/ControllerInterface/iOS/MFiControllerScanner.h"
+#include "InputCommon/ControllerInterface/iOS/MFiKeyboard.h"
 #include "InputCommon/ControllerInterface/iOS/StateManager.h"
 #include "InputCommon/ControllerInterface/iOS/Touchscreen.h"
 
@@ -49,5 +50,8 @@
 
   for (GCController* controller in [GCController controllers])
     g_controller_interface.AddDevice(std::make_shared<MFiController>(controller));
+
+  for (GCKeyboard* keyboard in [m_mfi_scanner keyboards])
+    g_controller_interface.AddDevice(std::make_shared<MFiKeyboard>(keyboard));
 }
 }  // namespace ciface::iOS