Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move input to its own directory #7126

Merged
merged 2 commits into from Dec 22, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
19 changes: 10 additions & 9 deletions rpcs3/CMakeLists.txt
Expand Up @@ -44,22 +44,23 @@ add_subdirectory(Emu)
add_subdirectory(rpcs3qt)

set(RPCS3_SRC
basic_keyboard_handler.cpp
basic_mouse_handler.cpp
display_sleep_control.cpp
ds3_pad_handler.cpp
ds4_pad_handler.cpp
evdev_joystick_handler.cpp
headless_application.cpp
keyboard_pad_handler.cpp
main.cpp
main_application.cpp
mm_joystick_handler.cpp
pad_thread.cpp
rpcs3_version.cpp
stb_image.cpp
stdafx.cpp
xinput_pad_handler.cpp

Input/basic_keyboard_handler.cpp
Input/basic_mouse_handler.cpp
Input/ds3_pad_handler.cpp
Input/ds4_pad_handler.cpp
Input/evdev_joystick_handler.cpp
Input/keyboard_pad_handler.cpp
Input/mm_joystick_handler.cpp
Input/pad_thread.cpp
Input/xinput_pad_handler.cpp
)

if(WIN32)
Expand Down
2 changes: 1 addition & 1 deletion rpcs3/Emu/Cell/Modules/cellGem.cpp
Expand Up @@ -5,7 +5,7 @@
#include "Emu/IdManager.h"
#include "Emu/System.h"
#include "Emu/Cell/PPUModule.h"
#include "pad_thread.h"
#include "Input/pad_thread.h"
#include "Emu/Io/MouseHandler.h"
#include "Emu/RSX/GSRender.h"
#include "Utilities/Timer.h"
Expand Down
2 changes: 1 addition & 1 deletion rpcs3/Emu/Cell/Modules/cellOskDialog.cpp
Expand Up @@ -3,7 +3,7 @@
#include "Emu/IdManager.h"
#include "Emu/Cell/PPUModule.h"
#include "Emu/RSX/Overlays/overlays.h"
#include "pad_thread.h"
#include "Input/pad_thread.h"

#include "cellSysutil.h"
#include "cellOskDialog.h"
Expand Down
2 changes: 1 addition & 1 deletion rpcs3/Emu/Cell/Modules/cellPad.cpp
Expand Up @@ -4,7 +4,7 @@
#include "Emu/Cell/PPUModule.h"
#include "Emu/Cell/lv2/sys_process.h"

#include "pad_thread.h"
#include "Input/pad_thread.h"
#include "cellPad.h"

extern logs::channel sys_io;
Expand Down
2 changes: 1 addition & 1 deletion rpcs3/Emu/Io/PadHandler.cpp
@@ -1,6 +1,6 @@
#include "stdafx.h"
#include "PadHandler.h"
#include "pad_thread.h"
#include "Input/pad_thread.h"

cfg_input g_cfg_input;

Expand Down
2 changes: 1 addition & 1 deletion rpcs3/Emu/RSX/Overlays/overlays.h
Expand Up @@ -6,7 +6,7 @@
#include "../../Io/PadHandler.h"
#include "Emu/Memory/vm.h"
#include "Emu/IdManager.h"
#include "pad_thread.h"
#include "Input/pad_thread.h"

#include "Emu/Cell/ErrorCodes.h"
#include "Emu/Cell/Modules/cellSaveData.h"
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
16 changes: 8 additions & 8 deletions rpcs3/main_application.cpp
@@ -1,22 +1,22 @@
#include "main_application.h"

#include "pad_thread.h"
#include "Input/pad_thread.h"
#include "Emu/Io/Null/NullPadHandler.h"
#include "Emu/Io/Null/NullKeyboardHandler.h"
#include "Emu/Io/Null/NullMouseHandler.h"
#include "Emu/Io/KeyboardHandler.h"
#include "Emu/Io/PadHandler.h"
#include "Emu/Io/MouseHandler.h"
#include "basic_keyboard_handler.h"
#include "basic_mouse_handler.h"
#include "keyboard_pad_handler.h"
#include "ds4_pad_handler.h"
#include "Input/basic_keyboard_handler.h"
#include "Input/basic_mouse_handler.h"
#include "Input/keyboard_pad_handler.h"
#include "Input/ds4_pad_handler.h"
#ifdef _WIN32
#include "xinput_pad_handler.h"
#include "mm_joystick_handler.h"
#include "Input/xinput_pad_handler.h"
#include "Input/mm_joystick_handler.h"
#endif
#ifdef HAVE_LIBEVDEV
#include "evdev_joystick_handler.h"
#include "Input/evdev_joystick_handler.h"
#endif

#include "Emu/Audio/AudioBackend.h"
Expand Down
38 changes: 19 additions & 19 deletions rpcs3/rpcs3.vcxproj
Expand Up @@ -331,17 +331,17 @@
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="basic_keyboard_handler.cpp" />
<ClCompile Include="basic_mouse_handler.cpp" />
<ClCompile Include="display_sleep_control.cpp" />
<ClCompile Include="ds3_pad_handler.cpp" />
<ClCompile Include="ds4_pad_handler.cpp" />
<ClCompile Include="evdev_joystick_handler.cpp" />
<ClCompile Include="keyboard_pad_handler.cpp" />
<ClCompile Include="main.cpp" />
<ClCompile Include="main_application.cpp" />
<ClCompile Include="mm_joystick_handler.cpp" />
<ClCompile Include="pad_thread.cpp" />
<ClCompile Include="Input\basic_keyboard_handler.cpp" />
<ClCompile Include="Input\basic_mouse_handler.cpp" />
<ClCompile Include="Input\ds3_pad_handler.cpp" />
<ClCompile Include="Input\ds4_pad_handler.cpp" />
<ClCompile Include="Input\evdev_joystick_handler.cpp" />
<ClCompile Include="Input\keyboard_pad_handler.cpp" />
<ClCompile Include="Input\mm_joystick_handler.cpp" />
<ClCompile Include="Input\pad_thread.cpp" />
<ClCompile Include="QTGeneratedFiles\Debug - LLVM\moc_about_dialog.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release - LLVM|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
Expand Down Expand Up @@ -1193,7 +1193,7 @@
<ClCompile Include="rpcs3qt\save_data_dialog.cpp" />
<ClCompile Include="rpcs3qt\save_data_list_dialog.cpp" />
<ClCompile Include="rpcs3qt\settings_dialog.cpp" />
<ClCompile Include="xinput_pad_handler.cpp" />
<ClCompile Include="Input\xinput_pad_handler.cpp" />
<ClCompile Include="\rpcs3qt\*.cpp" />
</ItemGroup>
<ItemGroup>
Expand All @@ -1215,7 +1215,7 @@
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">$(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
</CustomBuild>
<CustomBuild Include="basic_keyboard_handler.h">
<CustomBuild Include="Input\basic_keyboard_handler.h">
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing basic_keyboard_handler.h...</Message>
<Message Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">Moc%27ing basic_keyboard_handler.h...</Message>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
Expand All @@ -1233,7 +1233,7 @@
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">$(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
</CustomBuild>
<CustomBuild Include="basic_mouse_handler.h">
<CustomBuild Include="Input\basic_mouse_handler.h">
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing basic_mouse_handler.h...</Message>
<Message Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">Moc%27ing basic_mouse_handler.h...</Message>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
Expand All @@ -1252,10 +1252,10 @@
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">$(QTDIR)\bin\moc.exe;%(FullPath);$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
</CustomBuild>
<ClInclude Include="display_sleep_control.h" />
<ClInclude Include="ds3_pad_handler.h" />
<ClInclude Include="ds4_pad_handler.h" />
<ClInclude Include="evdev_joystick_handler.h" />
<ClInclude Include="keyboard_pad_handler.h" />
<ClInclude Include="Input\ds3_pad_handler.h" />
<ClInclude Include="Input\ds4_pad_handler.h" />
<ClInclude Include="Input\evdev_joystick_handler.h" />
<ClInclude Include="Input\keyboard_pad_handler.h" />
<CustomBuild Include="rpcs3qt\gs_frame.h">
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing gs_frame.h...</Message>
<Message Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">Moc%27ing gs_frame.h...</Message>
Expand Down Expand Up @@ -1426,7 +1426,7 @@
<Command Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">
</Command>
</CustomBuild>
<ClInclude Include="mm_joystick_handler.h" />
<ClInclude Include="Input/mm_joystick_handler.h" />
<CustomBuild Include="rpcs3qt\cg_disasm_window.h">
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing cg_disasm_window.h...</Message>
<Message Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">Moc%27ing cg_disasm_window.h...</Message>
Expand Down Expand Up @@ -1535,7 +1535,7 @@
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">"$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_OPENGL_LIB -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_QML_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DQT_CONCURRENT_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\minidx12\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtOpenGL" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtQml" "-I$(QTDIR)\include\QtNetwork" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent"</Command>
</CustomBuild>
<ClInclude Include="pad_thread.h" />
<ClInclude Include="Input\pad_thread.h" />
<ClInclude Include="QTGeneratedFiles\ui_about_dialog.h" />
<ClInclude Include="QTGeneratedFiles\ui_main_window.h" />
<ClInclude Include="QTGeneratedFiles\ui_pad_settings_dialog.h" />
Expand Down Expand Up @@ -2007,7 +2007,7 @@
<ClInclude Include="rpcs3qt\trophy_notification_frame.h" />
<ClInclude Include="rpcs3qt\trophy_notification_helper.h" />
<ClInclude Include="rpcs3qt\user_account.h" />
<ClInclude Include="xinput_pad_handler.h" />
<ClInclude Include="Input\xinput_pad_handler.h" />
<ClInclude Include="\rpcs3qt\*.h" />
</ItemGroup>
<ItemGroup>
Expand Down Expand Up @@ -2191,4 +2191,4 @@
<UserProperties MocDir=".\QTGeneratedFiles\$(ConfigurationName)" UicDir=".\QTGeneratedFiles" RccDir=".\QTGeneratedFiles" Qt5Version_x0020_x64="$(DefaultQtVersion)" />
</VisualStudio>
</ProjectExtensions>
</Project>
</Project>
38 changes: 19 additions & 19 deletions rpcs3/rpcs3.vcxproj.filters
Expand Up @@ -296,7 +296,7 @@
<ClCompile Include="QTGeneratedFiles\Debug - LLVM\moc_settings_dialog.cpp">
<Filter>Generated Files\Debug - LLVM</Filter>
</ClCompile>
<ClCompile Include="basic_keyboard_handler.cpp">
<ClCompile Include="Input\basic_keyboard_handler.cpp">
<Filter>Io\Basic</Filter>
</ClCompile>
<ClCompile Include="QTGeneratedFiles\Release - LLVM\moc_basic_keyboard_handler.cpp">
Expand All @@ -323,16 +323,16 @@
<ClCompile Include="QTGeneratedFiles\Debug - LLVM\moc_basic_mouse_handler.cpp">
<Filter>Generated Files\Debug - LLVM</Filter>
</ClCompile>
<ClCompile Include="basic_mouse_handler.cpp">
<ClCompile Include="Input\basic_mouse_handler.cpp">
<Filter>Io\Basic</Filter>
</ClCompile>
<ClCompile Include="ds4_pad_handler.cpp">
<ClCompile Include="Input\ds4_pad_handler.cpp">
<Filter>Io\DS4</Filter>
</ClCompile>
<ClCompile Include="mm_joystick_handler.cpp">
<ClCompile Include="Input\mm_joystick_handler.cpp">
<Filter>Io\MMJoystick</Filter>
</ClCompile>
<ClCompile Include="xinput_pad_handler.cpp">
<ClCompile Include="Input\xinput_pad_handler.cpp">
<Filter>Io\XInput</Filter>
</ClCompile>
<ClCompile Include="QTGeneratedFiles\Release - LLVM\moc_msg_dialog_frame.cpp">
Expand Down Expand Up @@ -461,7 +461,7 @@
<ClCompile Include="QTGeneratedFiles\Debug - LLVM\moc_save_manager_dialog.cpp">
<Filter>Generated Files\Debug - LLVM</Filter>
</ClCompile>
<ClCompile Include="pad_thread.cpp">
<ClCompile Include="Input\pad_thread.cpp">
<Filter>Io</Filter>
</ClCompile>
<ClCompile Include="rpcs3qt\about_dialog.cpp">
Expand Down Expand Up @@ -554,7 +554,7 @@
<ClCompile Include="rpcs3qt\msg_dialog_frame.cpp">
<Filter>Gui\message dialog</Filter>
</ClCompile>
<ClCompile Include="evdev_joystick_handler.cpp">
<ClCompile Include="Input\evdev_joystick_handler.cpp">
<Filter>Io\evdev</Filter>
</ClCompile>
<ClCompile Include="rpcs3qt\save_manager_dialog.cpp">
Expand Down Expand Up @@ -656,7 +656,7 @@
<ClCompile Include="rpcs3qt\_discord_utils.cpp">
<Filter>Gui\utils</Filter>
</ClCompile>
<ClCompile Include="keyboard_pad_handler.cpp">
<ClCompile Include="Input/keyboard_pad_handler.cpp">
<Filter>Io\Keyboard</Filter>
</ClCompile>
<ClCompile Include="QTGeneratedFiles\Release - LLVM\moc_trophy_manager_dialog.cpp">
Expand Down Expand Up @@ -716,7 +716,7 @@
<ClCompile Include="QTGeneratedFiles\Debug - LLVM\moc_osk_dialog_frame.cpp">
<Filter>Generated Files\Debug - LLVM</Filter>
</ClCompile>
<ClCompile Include="ds3_pad_handler.cpp">
<ClCompile Include="Input/ds3_pad_handler.cpp">
<Filter>Io\DS3</Filter>
</ClCompile>
<ClCompile Include="rpcs3qt\gui_application.cpp">
Expand Down Expand Up @@ -793,13 +793,13 @@
<ClInclude Include="\rpcs3qt\*.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="ds4_pad_handler.h">
<ClInclude Include="Input\ds4_pad_handler.h">
<Filter>Io\DS4</Filter>
</ClInclude>
<ClInclude Include="mm_joystick_handler.h">
<ClInclude Include="Input\mm_joystick_handler.h">
<Filter>Io\MMJoystick</Filter>
</ClInclude>
<ClInclude Include="xinput_pad_handler.h">
<ClInclude Include="Input\xinput_pad_handler.h">
<Filter>Io\XInput</Filter>
</ClInclude>
<ClInclude Include="QTGeneratedFiles\ui_about_dialog.h">
Expand All @@ -826,7 +826,7 @@
<ClInclude Include="rpcs3qt\trophy_notification_frame.h">
<Filter>Gui\trophy</Filter>
</ClInclude>
<ClInclude Include="pad_thread.h">
<ClInclude Include="Input\pad_thread.h">
<Filter>Io</Filter>
</ClInclude>
<ClInclude Include="rpcs3qt\gl_gs_frame.h">
Expand All @@ -847,7 +847,7 @@
<ClInclude Include="rpcs3qt\instruction_editor_dialog.h">
<Filter>Gui\debugger</Filter>
</ClInclude>
<ClInclude Include="evdev_joystick_handler.h">
<ClInclude Include="Input\evdev_joystick_handler.h">
<Filter>Io\evdev</Filter>
</ClInclude>
<ClInclude Include="rpcs3qt\find_dialog.h">
Expand All @@ -868,10 +868,10 @@
<ClInclude Include="rpcs3qt\_discord_utils.h">
<Filter>Gui\utils</Filter>
</ClInclude>
<ClInclude Include="keyboard_pad_handler.h">
<ClInclude Include="Input/keyboard_pad_handler.h">
<Filter>Io\Keyboard</Filter>
</ClInclude>
<ClInclude Include="ds3_pad_handler.h">
<ClInclude Include="Input/ds3_pad_handler.h">
<Filter>Io\DS3</Filter>
</ClInclude>
<ClInclude Include="rpcs3qt\stylesheets.h">
Expand All @@ -891,10 +891,10 @@
<CustomBuild Include="release\moc_predefs.h.cbt">
<Filter>Generated Files</Filter>
</CustomBuild>
<CustomBuild Include="basic_keyboard_handler.h">
<CustomBuild Include="Input\basic_keyboard_handler.h">
<Filter>Io\Basic</Filter>
</CustomBuild>
<CustomBuild Include="basic_mouse_handler.h">
<CustomBuild Include="Input\basic_mouse_handler.h">
<Filter>Io\Basic</Filter>
</CustomBuild>
<ClInclude Include="resource.h">
Expand Down Expand Up @@ -1048,4 +1048,4 @@
<ItemGroup>
<ResourceCompile Include="rpcs3.rc" />
</ItemGroup>
</Project>
</Project>
12 changes: 6 additions & 6 deletions rpcs3/rpcs3qt/pad_settings_dialog.cpp
Expand Up @@ -13,15 +13,15 @@

#include "Emu/Io/Null/NullPadHandler.h"

#include "keyboard_pad_handler.h"
#include "ds3_pad_handler.h"
#include "ds4_pad_handler.h"
#include "Input/keyboard_pad_handler.h"
#include "Input/ds3_pad_handler.h"
#include "Input/ds4_pad_handler.h"
#ifdef _WIN32
#include "xinput_pad_handler.h"
#include "mm_joystick_handler.h"
#include "Input/xinput_pad_handler.h"
#include "Input/mm_joystick_handler.h"
#endif
#ifdef HAVE_LIBEVDEV
#include "evdev_joystick_handler.h"
#include "Input/evdev_joystick_handler.h"
#endif

inline std::string sstr(const QString& _in) { return _in.toStdString(); }
Expand Down