Skip to content

New input gui #1713

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.

Sign up for GitHub

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

Merged
RadWolfie merged 19 commits into from
Sep 5, 2019
Merged

New input gui #1713

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
5833261
Added SDL2 submodule
ergo720 Aug 27, 2019
4a00a99
Ported input gui code from lle_input_gui branch
ergo720 Aug 27, 2019
902f61c
Integrated input manager with the hle input code (untested)
ergo720 Aug 30, 2019
7be025d
Bug fixes, added button binding removal to input gui, removed mouse s…
ergo720 Sep 1, 2019
84d8dbc
Disable Steel Battalion project
ergo720 Sep 1, 2019
0b1dd28
Updated copyright texts
ergo720 Sep 1, 2019
82c9807
Removed empty else block and useless pragma once
ergo720 Sep 1, 2019
dcefc88
Fix no input in Tenerezza
ergo720 Sep 2, 2019
815a9df
Updates license.txt in copyright texts to point to the original repos…
ergo720 Sep 3, 2019
14af004
Renamed Modifier to L/R Click in Duke GUI
ergo720 Sep 3, 2019
7e086a8
Clear bindings in GUI when a profile is deleted
ergo720 Sep 3, 2019
977fefa
Removed Load button, automatically assign profile to settings when sw…
ergo720 Sep 4, 2019
e6dbf8a
Set maximum text length to profile name
ergo720 Sep 4, 2019
26efe71
Make rumble window display the selected rumble binding when opening
ergo720 Sep 4, 2019
87a25f2
Check if profile was saved before closing, removed useless child hand…
ergo720 Sep 5, 2019
ab81c86
Added messagebox to clear button
ergo720 Sep 5, 2019
8e66f8e
Use SDL-mirror for SDL submodule
ergo720 Sep 5, 2019
a001e46
Switched position of Left/Right buttons in gui
ergo720 Sep 5, 2019
edc503e
Set rumble state back to zero after rumble test ends
ergo720 Sep 5, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ on_success:
If ($env:configuration -eq 'Release') {
cd "bin\${env:configuration}"
7z u "${env:configuration}.zip" ..\..\..\COPYING ..\..\..\README.md
7z u "${env:configuration}.zip" Cxbx.exe glew32.dll subhook.dll CxbxVSBC.dll
7z u "${env:configuration}.zip" Cxbx.exe glew32.dll subhook.dll SDL2.dll
7z u "${env:configuration}.zip" cxbxr-debugger.exe capstone.dll cs_x86.dll
Get-ChildItem .\*.zip | % { Push-AppveyorArtifact $_.FullName -FileName $_.Name }
}
2 changes: 1 addition & 1 deletion .azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ jobs:
build\bin\$(configuration)\Cxbx.exe
build\bin\$(configuration)\glew32.dll
build\bin\$(configuration)\subhook.dll
build\bin\$(configuration)\CxbxVSBC.dll
build\bin\$(configuration)\SDL2.dll
build\bin\$(configuration)\cxbxr-debugger.exe
build\bin\$(configuration)\capstone.dll
build\bin\$(configuration)\cx_x86.dll
Expand Down
3 changes: 3 additions & 0 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,6 @@
path = import/libtomcrypt
url = https://github.com/libtom/libtomcrypt
branch = master
[submodule "import/SDL2"]
path = import/SDL2
url = https://github.com/SDL-mirror/SDL
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ script:
# - mkdir export
# - 7z u export/${configuration} COPYING README.md
# - cd build/win32/${configuration}
# - 7z u ../../../export/${configuration} Cxbx.exe glew32.dll subhook.dll CxbxVSBC.dll
# - 7z u ../../../export/${configuration} Cxbx.exe glew32.dll subhook.dll SDL2.dll
# - 7z u ../../../export/${configuration} CxbxDebugger.exe capstone.dll cs_x86.dll
# - cd ../../../

Expand Down
44 changes: 25 additions & 19 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ add_subdirectory("${CMAKE_CURRENT_LIST_DIR}/import/XbSymbolDatabase")
# Not require since only include a header file
#add_subdirectory("${CMAKE_CURRENT_LIST_DIR}/import/simpleini")

#add_subdirectory("${CMAKE_CURRENT_LIST_DIR}/import/SDL2")
add_subdirectory("${CMAKE_CURRENT_LIST_DIR}/import/SDL2")

if(${CMAKE_GENERATOR} MATCHES "Visual Studio ([^9]|[9][0-9])")
add_subdirectory("${CMAKE_CURRENT_LIST_DIR}/import/cs_x86")
Expand Down Expand Up @@ -54,7 +54,7 @@ configure_file(
NEWLINE_STYLE LF
)

add_subdirectory("${CMAKE_CURRENT_LIST_DIR}/projects/vsbc")
#add_subdirectory("${CMAKE_CURRENT_LIST_DIR}/projects/vsbc")

# Split the files into group for which project is likely
# going to be used for both header and source files.
Expand All @@ -73,8 +73,15 @@ file (GLOB CXBXR_HEADER_COMMON
"${CXBXR_ROOT_DIR}/src/common/CxbxDebugger.h"
"${CXBXR_ROOT_DIR}/src/common/EmuEEPROM.h"
"${CXBXR_ROOT_DIR}/src/common/Error.h"
"${CXBXR_ROOT_DIR}/src/common/input/InputConfig.h"
"${CXBXR_ROOT_DIR}/src/common/input/SDL2_Device.h"
"${CXBXR_ROOT_DIR}/src/common/input/Button.h"
"${CXBXR_ROOT_DIR}/src/common/input/DInputKeyboardCodes.h"
"${CXBXR_ROOT_DIR}/src/common/input/DInputKeyboardMouse.h"
"${CXBXR_ROOT_DIR}/src/common/input/EmuDevice.h"
"${CXBXR_ROOT_DIR}/src/common/input/InputDevice.h"
"${CXBXR_ROOT_DIR}/src/common/input/InputManager.h"
"${CXBXR_ROOT_DIR}/src/common/input/InputWindow.h"
"${CXBXR_ROOT_DIR}/src/common/input/SdlJoystick.h"
"${CXBXR_ROOT_DIR}/src/common/input/XInputPad.h"
"${CXBXR_ROOT_DIR}/src/common/IPCHybrid.hpp"
"${CXBXR_ROOT_DIR}/src/common/Logging.h"
"${CXBXR_ROOT_DIR}/src/common/ReservedMemory.h"
Expand All @@ -85,11 +92,9 @@ file (GLOB CXBXR_HEADER_COMMON
"${CXBXR_ROOT_DIR}/src/common/util/CxbxUtil.h"
"${CXBXR_ROOT_DIR}/src/common/win32/AlignPosfix1.h"
"${CXBXR_ROOT_DIR}/src/common/win32/AlignPrefix1.h"
"${CXBXR_ROOT_DIR}/src/common/win32/DInputController.h"
"${CXBXR_ROOT_DIR}/src/common/win32/EmuShared.h"
"${CXBXR_ROOT_DIR}/src/common/win32/Mutex.h"
"${CXBXR_ROOT_DIR}/src/common/win32/Threads.h"
"${CXBXR_ROOT_DIR}/src/common/win32/XBPortMapping.h"
"${CXBXR_ROOT_DIR}/src/common/xbdm/CxbxXbdm.h"
"${CXBXR_ROOT_DIR}/src/common/xbe/Xbe.h"
"${CXBXR_ROOT_DIR}/src/common/xbe/XbePrinter.h"
Expand All @@ -105,12 +110,12 @@ file (GLOB CXBXR_HEADER_GUIv1
"${CXBXR_ROOT_DIR}/src/gui/DbgConsole.h"
"${CXBXR_ROOT_DIR}/src/gui/DlgAbout.h"
"${CXBXR_ROOT_DIR}/src/gui/DlgAudioConfig.h"
"${CXBXR_ROOT_DIR}/src/gui/DlgControllerConfig.h"
"${CXBXR_ROOT_DIR}/src/gui/DlgInputConfig.h"
"${CXBXR_ROOT_DIR}/src/gui/DlgDukeControllerConfig.h"
"${CXBXR_ROOT_DIR}/src/gui/DlgEepromConfig.h"
"${CXBXR_ROOT_DIR}/src/gui/DlgLoggingConfig.h"
"${CXBXR_ROOT_DIR}/src/gui/DlgNetworkConfig.h"
"${CXBXR_ROOT_DIR}/src/gui/DlgVideoConfig.h"
"${CXBXR_ROOT_DIR}/src/gui/DlgXboxControllerPortMapping.h"
"${CXBXR_ROOT_DIR}/src/gui/ResCxbx.h"
"${CXBXR_ROOT_DIR}/src/gui/Wnd.h"
"${CXBXR_ROOT_DIR}/src/gui/WndMain.h"
Expand Down Expand Up @@ -140,9 +145,8 @@ file (GLOB CXBXR_HEADER_EMU
"${CXBXR_ROOT_DIR}/src/core/hle/Intercept.hpp"
"${CXBXR_ROOT_DIR}/src/core/hle/Patches.hpp"
"${CXBXR_ROOT_DIR}/src/core/hle/XACTENG/XactEng.h"
"${CXBXR_ROOT_DIR}/src/core/hle/XAPI/OHCI/XInput/DInput.h"
"${CXBXR_ROOT_DIR}/src/core/hle/XAPI/OHCI/XInput/XInput.h"
"${CXBXR_ROOT_DIR}/src/core/hle/XAPI/Xapi.h"
"${CXBXR_ROOT_DIR}/src/core/hle/XAPI/XapiCxbxr.h"
"${CXBXR_ROOT_DIR}/src/core/hle/XGRAPHIC/XGraphic.h"
"${CXBXR_ROOT_DIR}/src/core/hle/XONLINE/XOnline.h"
"${CXBXR_ROOT_DIR}/src/core/kernel/common/strings.hpp"
Expand Down Expand Up @@ -199,21 +203,25 @@ file (GLOB CXBXR_SOURCE_COMMON
"${CXBXR_ROOT_DIR}/src/common/CxbxDebugger.cpp"
"${CXBXR_ROOT_DIR}/src/common/EmuEEPROM.cpp"
"${CXBXR_ROOT_DIR}/src/common/Error.cpp"
"${CXBXR_ROOT_DIR}/src/common/input/InputConfig.cpp"
"${CXBXR_ROOT_DIR}/src/common/input/SDL2_Device.cpp"
"${CXBXR_ROOT_DIR}/src/common/input/Button.cpp"
"${CXBXR_ROOT_DIR}/src/common/input/DInputKeyboardMouse.cpp"
"${CXBXR_ROOT_DIR}/src/common/input/EmuDevice.cpp"
"${CXBXR_ROOT_DIR}/src/common/input/InputDevice.cpp"
"${CXBXR_ROOT_DIR}/src/common/input/InputManager.cpp"
"${CXBXR_ROOT_DIR}/src/common/input/InputWindow.cpp"
"${CXBXR_ROOT_DIR}/src/common/input/SdlJoystick.cpp"
"${CXBXR_ROOT_DIR}/src/common/input/XInputPad.cpp"
"${CXBXR_ROOT_DIR}/src/common/Logging.cpp"
"${CXBXR_ROOT_DIR}/src/common/Settings.cpp"
"${CXBXR_ROOT_DIR}/src/common/Timer.cpp"
"${CXBXR_ROOT_DIR}/src/common/util/crc32c.cpp"
"${CXBXR_ROOT_DIR}/src/common/util/CxbxUtil.cpp"
"${CXBXR_ROOT_DIR}/src/common/util/hasher.cpp"
"${CXBXR_ROOT_DIR}/src/common/win32/DInputController.cpp"
"${CXBXR_ROOT_DIR}/src/common/win32/EmuShared.cpp"
"${CXBXR_ROOT_DIR}/src/common/win32/InlineFunc.cpp"
"${CXBXR_ROOT_DIR}/src/common/win32/IPCWindows.cpp"
"${CXBXR_ROOT_DIR}/src/common/win32/Mutex.cpp"
"${CXBXR_ROOT_DIR}/src/common/win32/Threads.cpp"
"${CXBXR_ROOT_DIR}/src/common/win32/XBPortMapping.cpp"
"${CXBXR_ROOT_DIR}/src/common/xbdm/CxbxXbdm.cpp"
"${CXBXR_ROOT_DIR}/src/common/xbe/Xbe.cpp"
"${CXBXR_ROOT_DIR}/src/common/xbe/XbePrinter.cpp"
Expand All @@ -227,12 +235,12 @@ file (GLOB CXBXR_SOURCE_COMMON
file (GLOB CXBXR_SOURCE_GUIv1
"${CXBXR_ROOT_DIR}/src/gui/DlgAbout.cpp"
"${CXBXR_ROOT_DIR}/src/gui/DlgAudioConfig.cpp"
"${CXBXR_ROOT_DIR}/src/gui/DlgControllerConfig.cpp"
"${CXBXR_ROOT_DIR}/src/gui/DlgInputConfig.cpp"
"${CXBXR_ROOT_DIR}/src/gui/DlgDukeControllerConfig.cpp"
"${CXBXR_ROOT_DIR}/src/gui/DlgEepromConfig.cpp"
"${CXBXR_ROOT_DIR}/src/gui/DlgLoggingConfig.cpp"
"${CXBXR_ROOT_DIR}/src/gui/DlgNetworkConfig.cpp"
"${CXBXR_ROOT_DIR}/src/gui/DlgVideoConfig.cpp"
"${CXBXR_ROOT_DIR}/src/gui/DlgXboxControllerPortMapping.cpp"
"${CXBXR_ROOT_DIR}/src/gui/WinMain.cpp"
"${CXBXR_ROOT_DIR}/src/gui/Wnd.cpp"
"${CXBXR_ROOT_DIR}/src/gui/WndMain.cpp"
Expand Down Expand Up @@ -265,8 +273,6 @@ file (GLOB CXBXR_SOURCE_EMU
"${CXBXR_ROOT_DIR}/src/core/hle/Intercept.cpp"
"${CXBXR_ROOT_DIR}/src/core/hle/Patches.cpp"
"${CXBXR_ROOT_DIR}/src/core/hle/XACTENG/XactEng.cpp"
"${CXBXR_ROOT_DIR}/src/core/hle/XAPI/OHCI/XInput/DInput.cpp"
"${CXBXR_ROOT_DIR}/src/core/hle/XAPI/OHCI/XInput/XInput.cpp"
"${CXBXR_ROOT_DIR}/src/core/hle/XAPI/Xapi.cpp"
"${CXBXR_ROOT_DIR}/src/core/hle/XGRAPHIC/XGraphic.cpp"
"${CXBXR_ROOT_DIR}/src/core/hle/XONLINE/XOnline.cpp"
Expand Down Expand Up @@ -374,6 +380,6 @@ if(${CMAKE_GENERATOR} MATCHES "Visual Studio ([^9]|[9][0-9])")
endif()

# Cxbx-Reloaded project with third-party libraries
set_target_properties(cxbx subhook XbSymbolDatabase vsbc libtommath libtomcrypt
set_target_properties(cxbx subhook XbSymbolDatabase libtommath libtomcrypt
PROPERTIES FOLDER Cxbx-Reloaded
)
1 change: 1 addition & 0 deletions import/SDL2
Open in desktop
Submodule SDL2 added at c7b8b4
3 changes: 2 additions & 1 deletion projects/cxbx/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ include_directories(
"${CXBXR_ROOT_DIR}/import/libtommath"
"${CXBXR_ROOT_DIR}/import/libtomcrypt/src/headers"
"${CXBXR_ROOT_DIR}/import/winpcap/Include"
"${CXBXR_ROOT_DIR}/import/SDL2/include"
)

link_directories(
Expand Down Expand Up @@ -175,12 +176,12 @@ set(WINS_LIB
XINPUT9_1_0
Iphlpapi
wpcap
SDL2
)

target_link_libraries(cxbx
PUBLIC XbSymbolDatabase
subhook
vsbc
libtomcrypt

${WINS_LIB}
Expand Down
Loading