The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-02-12 23:48:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4789 from lioncash/input

Browse Source 
InputCommon: Move ControllerEmu to its own directory
This commit is contained in:
Matthew Parlane 2017-02-08 18:16:14 +13:00 committed by GitHub
commit 7b3b8f26a3
19 changed files with 85 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/Core/Analytics.cpp
View File

@ -21,7 +21,7 @@
#include "Core/HW/GCPad.h" #include "Core/HW/GCPad.h"
#include "Core/Movie.h" #include "Core/Movie.h"
#include "Core/NetPlayProto.h" #include "Core/NetPlayProto.h"
#include "InputCommon/ControllerEmu.h" #include "InputCommon/ControllerEmu/ControllerEmu.h"
#include "InputCommon/GCAdapter.h" #include "InputCommon/GCAdapter.h"
#include "InputCommon/InputConfig.h" #include "InputCommon/InputConfig.h"
#include "VideoCommon/VideoBackendBase.h" #include "VideoCommon/VideoBackendBase.h"

2
Source/Core/Core/HW/GCKeyboard.h
View File

@ -5,7 +5,7 @@
#pragma once #pragma once
#include "Common/CommonTypes.h" #include "Common/CommonTypes.h"
#include "InputCommon/ControllerEmu.h" #include "InputCommon/ControllerEmu/ControllerEmu.h"
class InputConfig; class InputConfig;
enum class KeyboardGroup; enum class KeyboardGroup;

2
Source/Core/Core/HW/GCKeyboardEmu.cpp
View File

@ -4,7 +4,7 @@
#include "Core/HW/GCKeyboardEmu.h" #include "Core/HW/GCKeyboardEmu.h"
#include "Common/Common.h" #include "Common/Common.h"
#include "InputCommon/ControllerEmu.h" #include "InputCommon/ControllerEmu/ControllerEmu.h"
#include "InputCommon/KeyboardStatus.h" #include "InputCommon/KeyboardStatus.h"
static const u16 keys0_bitmasks[] = {KEYMASK_HOME, KEYMASK_END, KEYMASK_PGUP, KEYMASK_PGDN, static const u16 keys0_bitmasks[] = {KEYMASK_HOME, KEYMASK_END, KEYMASK_PGUP, KEYMASK_PGDN,

2
Source/Core/Core/HW/GCKeyboardEmu.h
View File

@ -6,7 +6,7 @@
#include <string> #include <string>
#include "InputCommon/ControllerEmu.h" #include "InputCommon/ControllerEmu/ControllerEmu.h"
struct KeyboardStatus; struct KeyboardStatus;

2
Source/Core/Core/HW/GCPad.h
View File

@ -5,7 +5,7 @@
#pragma once #pragma once
#include "Common/CommonTypes.h" #include "Common/CommonTypes.h"
#include "InputCommon/ControllerEmu.h" #include "InputCommon/ControllerEmu/ControllerEmu.h"
#include "InputCommon/ControllerInterface/Device.h" #include "InputCommon/ControllerInterface/Device.h"
class InputConfig; class InputConfig;

2
Source/Core/Core/HW/GCPadEmu.h
View File

@ -6,7 +6,7 @@
#include <string> #include <string>
#include "InputCommon/ControllerEmu.h" #include "InputCommon/ControllerEmu/ControllerEmu.h"
class ControlGroup; class ControlGroup;

2
Source/Core/Core/HW/Wiimote.h
View File

@ -6,7 +6,7 @@
#include "Common/Common.h" #include "Common/Common.h"
#include "Common/CommonTypes.h" #include "Common/CommonTypes.h"
#include "InputCommon/ControllerEmu.h" #include "InputCommon/ControllerEmu/ControllerEmu.h"
class InputConfig; class InputConfig;
class PointerWrap; class PointerWrap;

2
Source/Core/Core/HW/WiimoteEmu/Attachment/Attachment.h
View File

@ -7,7 +7,7 @@
#include <array> #include <array>
#include <string> #include <string>
#include "Common/CommonTypes.h" #include "Common/CommonTypes.h"
#include "InputCommon/ControllerEmu.h" #include "InputCommon/ControllerEmu/ControllerEmu.h"
namespace WiimoteEmu namespace WiimoteEmu
{ {

2
Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.h
View File

@ -9,7 +9,7 @@
#include "Core/HW/WiimoteEmu/Encryption.h" #include "Core/HW/WiimoteEmu/Encryption.h"
#include "Core/HW/WiimoteEmu/WiimoteHid.h" #include "Core/HW/WiimoteEmu/WiimoteHid.h"
#include "InputCommon/ControllerEmu.h" #include "InputCommon/ControllerEmu/ControllerEmu.h"
// Registry sizes // Registry sizes
#define WIIMOTE_EEPROM_SIZE (16 * 1024) #define WIIMOTE_EEPROM_SIZE (16 * 1024)

2
Source/Core/Core/HotkeyManager.h
View File

@ -7,7 +7,7 @@
#include <array> #include <array>
#include <string> #include <string>
#include "InputCommon/ControllerEmu.h" #include "InputCommon/ControllerEmu/ControllerEmu.h"
#include "InputCommon/InputConfig.h" #include "InputCommon/InputConfig.h"
enum Hotkey enum Hotkey

2
Source/Core/DolphinWX/Input/InputConfigDiag.cpp
View File

@ -52,7 +52,7 @@
#include "DolphinWX/Input/NunchukInputConfigDiag.h" #include "DolphinWX/Input/NunchukInputConfigDiag.h"
#include "DolphinWX/Input/TurntableInputConfigDiag.h" #include "DolphinWX/Input/TurntableInputConfigDiag.h"
#include "DolphinWX/WxUtils.h" #include "DolphinWX/WxUtils.h"
#include "InputCommon/ControllerEmu.h" #include "InputCommon/ControllerEmu/ControllerEmu.h"
#include "InputCommon/ControllerInterface/ControllerInterface.h" #include "InputCommon/ControllerInterface/ControllerInterface.h"
#include "InputCommon/ControllerInterface/Device.h" #include "InputCommon/ControllerInterface/Device.h"
#include "InputCommon/ControllerInterface/ExpressionParser.h" #include "InputCommon/ControllerInterface/ExpressionParser.h"

2
Source/Core/DolphinWX/Input/InputConfigDiag.h
View File

@ -23,7 +23,7 @@
#include <wx/spinctrl.h> #include <wx/spinctrl.h>
#include <wx/timer.h> #include <wx/timer.h>
#include "InputCommon/ControllerEmu.h" #include "InputCommon/ControllerEmu/ControllerEmu.h"
#include "InputCommon/ControllerInterface/ControllerInterface.h" #include "InputCommon/ControllerInterface/ControllerInterface.h"
#include "InputCommon/ControllerInterface/Device.h" #include "InputCommon/ControllerInterface/Device.h"

2
Source/Core/DolphinWX/Input/InputConfigDiagBitmaps.cpp
View File

@ -22,7 +22,7 @@
#include "DolphinWX/Input/InputConfigDiag.h" #include "DolphinWX/Input/InputConfigDiag.h"
#include "DolphinWX/WxUtils.h" #include "DolphinWX/WxUtils.h"
#include "InputCommon/ControllerEmu.h" #include "InputCommon/ControllerEmu/ControllerEmu.h"
#include "InputCommon/ControllerInterface/ControllerInterface.h" #include "InputCommon/ControllerInterface/ControllerInterface.h"
#include "InputCommon/ControllerInterface/Device.h" #include "InputCommon/ControllerInterface/Device.h"

116
Source/Core/InputCommon/CMakeLists.txt
View File

@ -1,79 +1,79 @@
set(SRCS ControllerEmu.cpp set(SRCS InputConfig.cpp
InputConfig.cpp ControllerEmu/ControllerEmu.cpp
ControllerInterface/ControllerInterface.cpp ControllerInterface/ControllerInterface.cpp
ControllerInterface/Device.cpp ControllerInterface/Device.cpp
ControllerInterface/ExpressionParser.cpp) ControllerInterface/ExpressionParser.cpp)
set(LIBS common) set(LIBS common)
if(WIN32) if(WIN32)
set(SRCS ${SRCS} set(SRCS ${SRCS}
ControllerInterface/DInput/DInput.cpp ControllerInterface/DInput/DInput.cpp
ControllerInterface/DInput/DInputJoystick.cpp ControllerInterface/DInput/DInputJoystick.cpp
ControllerInterface/DInput/DInputKeyboardMouse.cpp ControllerInterface/DInput/DInputKeyboardMouse.cpp
ControllerInterface/DInput/XInputFilter.cpp ControllerInterface/DInput/XInputFilter.cpp
ControllerInterface/XInput/XInput.cpp ControllerInterface/XInput/XInput.cpp
ControllerInterface/ForceFeedback/ForceFeedbackDevice.cpp) ControllerInterface/ForceFeedback/ForceFeedbackDevice.cpp)
elseif(APPLE) elseif(APPLE)
find_library(COREFOUNDATION_LIBRARY CoreFoundation) find_library(COREFOUNDATION_LIBRARY CoreFoundation)
find_library(CARBON_LIBRARY Carbon) find_library(CARBON_LIBRARY Carbon)
find_library(COCOA_LIBRARY Cocoa) find_library(COCOA_LIBRARY Cocoa)
set(SRCS ${SRCS} set(SRCS ${SRCS}
ControllerInterface/OSX/OSX.mm ControllerInterface/OSX/OSX.mm
ControllerInterface/OSX/OSXKeyboard.mm ControllerInterface/OSX/OSXKeyboard.mm
ControllerInterface/OSX/OSXJoystick.mm ControllerInterface/OSX/OSXJoystick.mm
ControllerInterface/Quartz/Quartz.mm ControllerInterface/Quartz/Quartz.mm
ControllerInterface/Quartz/QuartzKeyboardAndMouse.mm ControllerInterface/Quartz/QuartzKeyboardAndMouse.mm
ControllerInterface/ForceFeedback/ForceFeedbackDevice.cpp) ControllerInterface/ForceFeedback/ForceFeedbackDevice.cpp)
set(LIBS ${LIBS} ${COREFOUNDATION_LIBRARY} ${CARBON_LIBRARY} ${COCOA_LIBRARY}) set(LIBS ${LIBS} ${COREFOUNDATION_LIBRARY} ${CARBON_LIBRARY} ${COCOA_LIBRARY})
elseif(X11_FOUND) elseif(X11_FOUND)
set(SRCS ${SRCS} set(SRCS ${SRCS}
ControllerInterface/Xlib/XInput2.cpp) ControllerInterface/Xlib/XInput2.cpp)
set(LIBS ${LIBS} ${X11_LIBRARIES} ${X11_INPUT_LIBRARIES}) set(LIBS ${LIBS} ${X11_LIBRARIES} ${X11_INPUT_LIBRARIES})
elseif(ANDROID) elseif(ANDROID)
add_definitions(-DCIFACE_USE_ANDROID) add_definitions(-DCIFACE_USE_ANDROID)
set(SRCS ${SRCS} set(SRCS ${SRCS}
ControllerInterface/Android/Android.cpp) ControllerInterface/Android/Android.cpp)
endif() endif()
if(ANDROID) if(ANDROID)
set(SRCS ${SRCS} GCAdapter_Android.cpp) set(SRCS ${SRCS} GCAdapter_Android.cpp)
else() else()
set(SRCS ${SRCS} GCAdapter.cpp) set(SRCS ${SRCS} GCAdapter.cpp)
set(LIBS ${LIBS} ${LIBUSB_LIBRARIES}) set(LIBS ${LIBS} ${LIBUSB_LIBRARIES})
endif() endif()
if(LIBEVDEV_FOUND AND LIBUDEV_FOUND) if(LIBEVDEV_FOUND AND LIBUDEV_FOUND)
set(SRCS ${SRCS} ControllerInterface/evdev/evdev.cpp) set(SRCS ${SRCS} ControllerInterface/evdev/evdev.cpp)
set(LIBS ${LIBS} ${LIBEVDEV_LIBRARY} ${LIBUDEV_LIBRARY}) set(LIBS ${LIBS} ${LIBEVDEV_LIBRARY} ${LIBUDEV_LIBRARY})
endif() endif()
if(UNIX) if(UNIX)
set(SRCS ${SRCS} ControllerInterface/Pipes/Pipes.cpp) set(SRCS ${SRCS} ControllerInterface/Pipes/Pipes.cpp)
endif() endif()
if(ENABLE_SDL) if(ENABLE_SDL)
find_package(SDL2) find_package(SDL2)
if(SDL2_FOUND) if(SDL2_FOUND)
message(STATUS "Using shared SDL2") message(STATUS "Using shared SDL2")
set(SDL_TARGET SDL2::SDL2) set(SDL_TARGET SDL2::SDL2)
else() else()
# SDL2 not found, try SDL # SDL2 not found, try SDL
find_package(SDL) find_package(SDL)
if(SDL_FOUND) if(SDL_FOUND)
message(STATUS "Using shared SDL") message(STATUS "Using shared SDL")
add_library(System_SDL INTERFACE) add_library(System_SDL INTERFACE)
target_include_directories(System_SDL INTERFACE ${SDL_INCLUDE_DIR}) target_include_directories(System_SDL INTERFACE ${SDL_INCLUDE_DIR})
target_link_libraries(System_SDL INTERFACE ${SDL_LIBRARY}) target_link_libraries(System_SDL INTERFACE ${SDL_LIBRARY})
set(SDL_TARGET System_SDL) set(SDL_TARGET System_SDL)
endif() endif()
endif() endif()
if(SDL_TARGET AND TARGET ${SDL_TARGET}) if(SDL_TARGET AND TARGET ${SDL_TARGET})
set(SRCS ${SRCS} ControllerInterface/SDL/SDL.cpp) set(SRCS ${SRCS} ControllerInterface/SDL/SDL.cpp)
set(LIBS ${LIBS} ${SDL_TARGET}) set(LIBS ${LIBS} ${SDL_TARGET})
add_definitions(-DHAVE_SDL=1) add_definitions(-DHAVE_SDL=1)
else() else()
message(STATUS "SDL NOT found, disabling SDL input") message(STATUS "SDL NOT found, disabling SDL input")
endif() endif()
endif() endif()
add_dolphin_library(inputcommon "${SRCS}" "${LIBS}") add_dolphin_library(inputcommon "${SRCS}" "${LIBS}")

2
Source/Core/InputCommon/ControllerEmu.cpp → Source/Core/InputCommon/ControllerEmu/ControllerEmu.cpp
View File

@ -2,7 +2,7 @@
// Licensed under GPLv2+ // Licensed under GPLv2+
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include "InputCommon/ControllerEmu.h" #include "InputCommon/ControllerEmu/ControllerEmu.h"
#include <memory> #include <memory>
#include "Common/Common.h" #include "Common/Common.h"
#include "VideoCommon/OnScreenDisplay.h" #include "VideoCommon/OnScreenDisplay.h"

0
Source/Core/InputCommon/ControllerEmu.h → Source/Core/InputCommon/ControllerEmu/ControllerEmu.h
View File

4
Source/Core/InputCommon/InputCommon.vcxproj
View File

@ -35,7 +35,7 @@
</ImportGroup> </ImportGroup>
<PropertyGroup Label="UserMacros" /> <PropertyGroup Label="UserMacros" />
<ItemGroup> <ItemGroup>
<ClCompile Include="ControllerEmu.cpp" /> <ClCompile Include="ControllerEmu\ControllerEmu.cpp" />
<ClCompile Include="ControllerInterface\ControllerInterface.cpp" /> <ClCompile Include="ControllerInterface\ControllerInterface.cpp" />
<ClCompile Include="ControllerInterface\Device.cpp" /> <ClCompile Include="ControllerInterface\Device.cpp" />
<ClCompile Include="ControllerInterface\DInput\DInput.cpp" /> <ClCompile Include="ControllerInterface\DInput\DInput.cpp" />
@ -55,7 +55,7 @@
<ClCompile Include="InputConfig.cpp" /> <ClCompile Include="InputConfig.cpp" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="ControllerEmu.h" /> <ClInclude Include="ControllerEmu\ControllerEmu.h" />
<ClInclude Include="ControllerInterface\ControllerInterface.h" /> <ClInclude Include="ControllerInterface\ControllerInterface.h" />
<ClInclude Include="ControllerInterface\Device.h" /> <ClInclude Include="ControllerInterface\Device.h" />
<ClInclude Include="ControllerInterface\DInput\DInput.h" /> <ClInclude Include="ControllerInterface\DInput\DInput.h" />

13
Source/Core/InputCommon/InputCommon.vcxproj.filters
View File

@ -13,11 +13,16 @@
<Filter Include="ControllerInterface\ForceFeedback"> <Filter Include="ControllerInterface\ForceFeedback">
<UniqueIdentifier>{e10ce316-283c-4be0-848d-578dec2b6404}</UniqueIdentifier> <UniqueIdentifier>{e10ce316-283c-4be0-848d-578dec2b6404}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="ControllerEmu">
<UniqueIdentifier>{4c839215-4085-4e34-a960-7960986ad015}</UniqueIdentifier>
</Filter>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="ControllerEmu.cpp" />
<ClCompile Include="GCAdapter.cpp" /> <ClCompile Include="GCAdapter.cpp" />
<ClCompile Include="InputConfig.cpp" /> <ClCompile Include="InputConfig.cpp" />
<ClCompile Include="ControllerEmu\ControllerEmu.cpp">
<Filter>ControllerEmu</Filter>
</ClCompile>
<ClCompile Include="ControllerInterface\DInput\DInput.cpp"> <ClCompile Include="ControllerInterface\DInput\DInput.cpp">
<Filter>ControllerInterface\DInput</Filter> <Filter>ControllerInterface\DInput</Filter>
</ClCompile> </ClCompile>
@ -47,10 +52,12 @@
</ClCompile> </ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="ControllerEmu.h" /> <ClInclude Include="GCAdapter.h" />
<ClCompile Include="GCAdapter.h" />
<ClInclude Include="GCPadStatus.h" /> <ClInclude Include="GCPadStatus.h" />
<ClInclude Include="InputConfig.h" /> <ClInclude Include="InputConfig.h" />
<ClInclude Include="ControllerEmu\ControllerEmu.h">
<Filter>ControllerEmu</Filter>
</ClInclude>
<ClInclude Include="ControllerInterface\DInput\DInput.h"> <ClInclude Include="ControllerInterface\DInput\DInput.h">
<Filter>ControllerInterface\DInput</Filter> <Filter>ControllerInterface\DInput</Filter>
</ClInclude> </ClInclude>

2
Source/Core/InputCommon/InputConfig.cpp
View File

@ -9,7 +9,7 @@
#include "Common/MsgHandler.h" #include "Common/MsgHandler.h"
#include "Core/ConfigManager.h" #include "Core/ConfigManager.h"
#include "Core/HW/Wiimote.h" #include "Core/HW/Wiimote.h"
#include "InputCommon/ControllerEmu.h" #include "InputCommon/ControllerEmu/ControllerEmu.h"
#include "InputCommon/ControllerInterface/ControllerInterface.h" #include "InputCommon/ControllerInterface/ControllerInterface.h"
#include "InputCommon/InputConfig.h" #include "InputCommon/InputConfig.h"