e6fc3b5662
Address comments
2020-08-27 17:19:21 -05:00
2d207ec609
Implement a basic class for motion devices
2020-08-27 17:19:21 -05:00
9e1b0af259
input_common: Eliminate most global state
...
Abstracts most of the input mechanisms under an InputSubsystem class
that is managed by the frontends, eliminating any static constructors
and destructors. This gets rid of global accessor functions and also
allows the frontends to have a more fine-grained control over the
lifecycle of the input subsystem.
This also makes it explicit which interfaces rely on the input subsystem
instead of making it opaque in the interface functions. All that remains
to migrate over is the factories, which can be done in a separate
change.
2020-08-27 16:11:17 -04:00
8ffc491546
input_common/main: Add "/Mouse" to the display name
2020-08-26 22:41:51 -04:00
de79897f04
input_common: Fix directional deadzone values
...
The hardware tested value is 0.5 which translates to SHRT_MAX / 2
2020-08-26 02:32:32 -04:00
efa0b7a056
Address feedback
2020-08-26 02:32:32 -04:00
f0fac0c7fb
Project Mjölnir: Part 1
...
Co-authored-by: James Rowe <jroweboy@gmail.com>
Co-authored-by: Its-Rei <kupfel@gmail.com>
2020-08-26 02:32:32 -04:00
f60d5aac3e
gc_poller: Resolve compilation warnings on MSVC
...
We just need to make our intentional implicit truncations explicit.
2020-08-25 23:03:12 -04:00
b724a4d90c
General: Tidy up clang-format warnings part 2
2020-08-13 14:19:08 -04:00
d6672501ac
Remove UI changes
...
This PR is now only the Analog devices handling the range value defaulting at 100%
2020-08-10 12:46:14 -04:00
9c6ae697f5
Add range slider functionality for gc adapter
2020-08-10 12:46:14 -04:00
8928aa3008
undo unnecessary newlines, slider range 50-150
2020-08-10 12:46:14 -04:00
ed51c2abda
Add range slider for analog sticks
2020-08-10 12:46:14 -04:00
d840ed90e1
GCAdapter: only join worker thread if running & joinable
2020-07-26 14:54:02 -07:00
4524e1bd54
Merge pull request #4418 from lioncash/udp-warn
...
udp/client: Remove unused boost include
2020-07-25 21:50:37 -07:00
1a7cf26884
udp/client: Remove unused boost include
...
Also silences a deprecation warning from boost on Clang/GCC.
2020-07-25 03:42:03 -04:00
ac7e4e2cab
gc_adapter: Resolve C++20 deprecation warning
2020-07-25 03:38:22 -04:00
04699c366b
gc_poller: Resolve -Wsign-compare warning
2020-07-25 03:37:22 -04:00
e19972dfc4
gc_poller: Resolve -Wredundant-move warning
2020-07-25 03:35:40 -04:00
68d6d3e173
Fix axis thresholding while polling
...
axes were very sensitive when mapping controls.
2020-07-19 11:49:26 -04:00
1e7bed0a45
std::size_t where appropriate, make error message more clear if can't read
2020-07-17 12:10:32 -04:00
94f5f29573
Refactor adapter code
2020-07-16 13:00:04 -04:00
93fe982a0c
Rebase to master
2020-07-14 13:04:02 -04:00
ab65de2f96
Fix crash if gc configured but adapter not connected
2020-07-14 11:23:10 -04:00
393cdb15f5
Merge pull request #4314 from lioncash/input-warn
...
gcadapter: Tidy up compiler warnings
2020-07-14 10:20:12 -04:00
edb291b3be
Merge pull request #4315 from lioncash/udp-warn
...
udp: Silence a C++20 deprecation warning
2020-07-14 09:33:16 -04:00
b284c43385
input_common: drop unused libusb.h include
...
Remnant of an early implementation.
2020-07-14 01:50:34 +00:00
883fab2fff
input_common: make libusb private to gc_adapter
2020-07-13 18:48:19 +00:00
8df93132cd
udp: Silence a C++20 deprecation warning
...
C++20 deprecates using the = lambda capture to implicitly capture the
this pointer. Instead, we must specify it explicitly.
2020-07-12 15:49:42 -04:00
a1dddca4ab
gc_poller: Mark GCButtonFactory::GetNextInput() as const
...
This doesn't modify class instance state.
2020-07-12 15:43:07 -04:00
839c91cd14
gc_poller: Get rid of undefined behavior in Create()
...
Ensures that the function always has returns in all control paths.
2020-07-12 15:41:35 -04:00
a8ba6dc3c9
gc_poller: Silence sign conversion warnings
2020-07-12 15:40:22 -04:00
32b6fc4062
gc_adapter: Remove deprecated usage of = in lambda captures
...
It's deprecated in C++20 to use = to capture the this pointer.
Instead, we can simply pass this as an argument to the thread
constructor.
2020-07-12 15:38:19 -04:00
9ce6ea648f
gc_adapter: Silence sign conversion warnings
2020-07-12 15:36:27 -04:00
042c6602a0
Break out of scan loop if can't find adapter on first run
2020-07-10 11:07:43 -04:00
48ff15602e
cmake: pass libusb include directory as well
...
In file included from src/input_common/gcadapter/gc_adapter.cpp:8:
src/./input_common/gcadapter/gc_adapter.h:11:10: fatal error: 'libusb.h' file not found
#include <libusb.h>
^~~~~~~~~~
2020-07-09 15:26:54 +00:00
4489ea6f53
Rebase to master, fix merge conflicts
2020-07-08 21:15:49 -04:00
5311b562aa
Merge pull request #4266 from jbeich/freebsd
...
gcadapter: unbreak build on FreeBSD
2020-07-08 16:30:26 -04:00
3c7a115afe
Address comments for better clarity/signed dev count
2020-07-08 14:18:54 -04:00
ec13746e4d
Add more libusb error checks
2020-07-08 13:19:33 -04:00
b57475887b
Address PR feedback, fix axis button thresholding
2020-07-07 12:20:59 -04:00
1db10b8f4c
input_common/gcadapter: add missing C++11 header required by libc++
...
In file included from src/input_common/gcadapter/gc_adapter.cpp:8:
src/./input_common/gcadapter/gc_adapter.h:77:10: error: no template named 'unordered_map' in namespace 'std'
std::unordered_map<int, bool> buttons;
~~~~~^
src/./input_common/gcadapter/gc_adapter.h:78:10: error: no template named 'unordered_map' in namespace 'std'
std::unordered_map<int, u16> axes;
~~~~~^
2020-07-07 10:02:03 +00:00
e3253b5f18
Brace the code! Fix compile error due to class member construction order
2020-07-06 23:01:57 -04:00
86abff48e1
Recalibrate reconnected controllers
2020-07-06 22:09:07 -04:00
7ad423923d
Save origin state of GC controller analog features, compare against origin for input detection
2020-07-06 21:58:31 -04:00
d00972fce1
Fix for always firing triggers on some controllers, trigger threshold more universal
2020-07-04 00:40:48 -04:00
e69d715e3d
Address lioncash feedback: Log formatting, extern const PadButtonArray, little touch ups
2020-07-03 11:52:07 -04:00
6e1639c7b0
Fix unnecessary diffs
2020-07-02 16:51:16 -04:00
6b7c8e469b
Add LR triggers as axes, half press to initiate a press, add GC axis id in config, clarify some code blocks for better readability
2020-07-02 15:54:44 -04:00
34a590e509
Reset adapter state on init, fixes errors relating driver hang from unexpected unplug
2020-07-01 12:52:50 -04:00
a76e11e7f0
Address feedback regarding increments, const vars, and general cleanup
2020-06-30 17:28:02 -04:00
dfdf87d844
fix implicit conversion of size_t type to int
2020-06-30 11:44:55 -04:00
bd697bef03
left const auto&, comment punctuation.
...
Co-authored-by: Morph <39850852+Morph1984@users.noreply.github.com>
2020-06-26 23:46:49 -04:00
ecbc813711
const& to button in button array
...
Co-authored-by: VolcaEM <63682805+VolcaEM@users.noreply.github.com>
2020-06-25 19:46:50 -04:00
3f739514e3
Stop reading loop if error is encountered
2020-06-25 19:31:51 -04:00
c18dc9c707
padbutton enum class and struct initiailization
2020-06-24 11:39:30 -04:00
743e1f02a0
cleanup check access, read, and factory GetNextInput funcs. Use size rather than magic number
2020-06-23 17:37:15 -04:00
d4e07fd95e
Fix deallocation of GC Adapter
2020-06-23 12:47:58 -04:00
fcc23139f6
std::array and const reference passing of non-trivial objects
2020-06-22 18:11:59 -04:00
f5d2a1e8bd
Update src/input_common/main.cpp
...
Co-authored-by: LC <mathew1800@gmail.com>
update libusb submodule (hopefully windows build error fixed)
2020-06-22 17:05:50 -04:00
28046ae3a9
Tidy up the pointers, use pair over tuple where appropriate
2020-06-21 23:56:56 -04:00
0f729ef078
fix for sleep using stl
2020-06-21 22:58:53 -04:00
46b4461fbb
shared_ptr for the GC adapter class, constexpr constants
2020-06-21 21:50:58 -04:00
968d631aa5
std::arrays where appropriate, clear q in adapter class, other touch ups
2020-06-21 21:17:46 -04:00
5f0fa4cb82
fix include thread
2020-06-21 21:17:46 -04:00
121af3646d
Singleton GC Adapter class, remove globals, fix naming convention
...
Fix clang formatting
Manual fix for configure_input_player formatting
Add missing lib usb cmake command
2020-06-21 21:17:07 -04:00
c94583d867
Clang Formatting
2020-06-21 15:31:57 -04:00
0076a08d04
Cleanup after linter
2020-06-21 13:02:43 -04:00
0248614add
GC Adapter Implementation
2020-06-21 12:36:28 -04:00
c6a963c48e
input_common/motion_emu: Remove redundant move
...
Named return value optimization automatically applies here.
2020-06-19 14:29:59 +01:00
8272f53cf9
input_common/keyboard: Remove redundant move
...
Named return value optimization automatically applies here.
2020-06-19 14:29:36 +01:00
3d1e741645
input_common: fix build when SDL2 is disabled
2020-05-02 21:47:17 +02:00
79c1269f0f
Merge pull request #3673 from lioncash/extra
...
CMakeLists: Specify -Wextra on linux builds
2020-04-16 21:12:33 -04:00
94c2c828a5
input_common: Use the CMake target instead of the variable.
2020-04-16 16:42:59 +02:00
1c340c6efa
CMakeLists: Specify -Wextra on linux builds
...
Allows reporting more cases where logic errors may exist, such as
implicit fallthrough cases, etc.
We currently ignore unused parameters, since we currently have many
cases where this is intentional (virtual interfaces).
While we're at it, we can also tidy up any existing code that causes
warnings. This also uncovered a few bugs as well.
2020-04-15 21:33:46 -04:00
e70451d967
Merge pull request #3525 from FearlessTobi/linux-compile-error
...
input_common/udp: Fix Linux build by using a backwards compatible way of error checking
2020-03-21 16:04:45 -04:00
716d6aee30
input_common/udp: Fix clang build issues
2020-03-18 04:30:26 -03:00
230ac6a4e8
input_common/udp: Fix Linux build by using a backwards compatible way of error checking
...
Should fix https://github.com/yuzu-emu/yuzu/issues/3487 .
error_code::failed is a function which has been introduced in Boost 1.69.
This version of boost hasn't landed in most major distros yet.
2020-03-17 12:29:25 +01:00
002d9508a0
input/udp - Add minor error handling to prevent bad input from crashing
2020-03-03 23:46:05 -07:00
2cdda8c564
input/udp - Dont log on invalid packet received
2020-03-03 19:52:16 -07:00
23c4cc80e2
analog_from_button get direction implementation
2020-02-18 06:45:37 +01:00
c7678c3044
input_common/udp: Ensure that UDP is shut down within Shutdown()
...
Previously the UDP backend would never actually get shut down.
2020-02-03 09:29:15 -05:00
83f8090273
input_common/udp: Add missing override specifiers
...
Prevents trivial warnings and ensures interfaces are properly
maintained between the base class.
2020-02-03 09:26:53 -05:00
5c61e0ba39
input_common/udp: std::move SocketCallback instances where applicable
...
std::function is allowed to heap allocate if the size of the captures
associated with each lambda exceed a certain threshold. This prevents
potentially unnecessary reallocations from occurring.
2020-02-03 09:24:05 -05:00
fb9c9ddcc9
input_common/udp: std::move shared_ptr within Client constructor
...
Gets rid of a trivially avoidable atomic reference count increment and
decrement.
2020-02-03 09:21:46 -05:00
9bb6ab77f4
udp/client: Replace deprecated from_string() call with make_address_v4()
...
Future-proofs code if boost is ever updated.
2020-02-03 09:20:40 -05:00
881408445a
input_common/udp: Silence -Wreorder warning for Socket
...
Amends the constructor initializer list to specify the order of its
elements in the same order that initialization would occur.
2020-02-03 09:15:32 -05:00
36524465a6
input_common/udp: Remove unnecessary inclusions
2020-02-03 09:13:40 -05:00
4aa9c9632d
input_common/udp: Add missing header guard
2020-02-03 09:09:06 -05:00
69a6796de1
Merge pull request #3284 from CJBok/hid-fix
...
hid: Fix analog sticks directional states
2020-02-01 14:02:41 -05:00
bbd85a495a
Address second part of review comments
2020-01-23 20:55:26 +01:00
0fe11746fc
Address review comments
2020-01-23 20:55:26 +01:00
ac3690f205
Input: UDP Client to provide motion and touch controls
...
An implementation of the cemuhook motion/touch protocol, this adds the
ability for users to connect several different devices to citra to send
direct motion and touch data to citra.
Co-Authored-By: jroweboy <jroweboy@gmail.com>
2020-01-23 20:55:26 +01:00
635deb70d4
Moved analog direction logic to sdl_impl
2020-01-15 11:25:15 +01:00
5ccf2a7b82
input_common/sdl/sdl_impl: Correct logging string in SDLState constructor
...
If this path was ever taken, a runtime exception would occur due to the
lack of a formatting specifier to insert the error code into the format
string.
2019-06-03 16:56:47 -04:00
cfac942e63
input_common/sdl/sdl_impl: Move documentation comments to header where applicable
...
Places the documentation comments with the rest of SDLState's member
function documentation.
2019-06-03 16:56:47 -04:00
b9b23c98ff
input_common/sdl/sdl_impl: Amend names for axes for SDLAnalogPoller
...
Adds another underscore to clearly indicate the axis names.
2019-06-03 16:56:47 -04:00
50048d9f5a
input_common/sdl/sdl_impl: Mark variables const where applicable
...
Make it explicit that these aren't modified elsewhere (either through
functions by reference, or by other operations).
2019-06-03 16:56:47 -04:00
ca7ca2919c
input_common/sdl/sdl_impl: Mark SDLEventToButtonParamPackage() as static
...
Its prototype declared at the top of the translation unit contains the
static qualifier, so the function itself should also contain it to make
it a proper internally linked function.
2019-06-03 16:56:47 -04:00
b73ea457cc
input_common/sdl/sdl_impl: Convert reinterpret_cast into a static_cast
...
It's valid to static_cast a void pointer back into its proper type.
2019-06-03 16:56:46 -04:00
2c679cda51
input_common/sdl/sdl_impl: Use insert_or_assign() where applicable
...
Same behavior, but without a potential need to unnecessarily default
construct a value.
2019-06-03 16:56:46 -04:00
b46e615551
input_common/sdl/sdl_impl: Simplify SDL_Joystick deleter handling
...
The deleter can just be set in the constructor and maintained throughout
the lifetime of the object.
If a contained pointer is null, then the deleter won't execute, so this
is safe to do. We don't need to swap it out with a version of a deleter
that does nothing.
2019-06-03 16:56:46 -04:00
7ea07c6063
input_common/sdl/sdl_impl: Resolve two sign conversion warnings
...
Silences the final two warnings in SDL code.
2019-06-03 16:56:46 -04:00
cf0d01a5d7
input_common/sdl: Remove unused header includes and forward declarations
...
Gets rid of a few unnecessary inclusion dependencies. It also uncovered
a few indirect inclusion dependencies being relied upon.
2019-06-03 16:56:42 -04:00
00f0827a26
input_common/sdl/sdl_impl: Use nested namespace specifiers where applicable
2019-06-03 15:49:04 -04:00
e70f16fff7
input_common/sdl/sdl_impl: Silence sign conversion warnings
...
Makes the conversions explicit, as opposed to implicit.
2019-05-31 04:47:02 -03:00
781ab8407b
general: Use deducation guides for std::lock_guard and std::unique_lock
...
Since C++17, the introduction of deduction guides for locking facilities
means that we no longer need to hardcode the mutex type into the locks
themselves, making it easier to switch mutex types, should it ever be
necessary in the future.
2019-04-01 12:53:47 -04:00
eb335f51ca
input_common/sdl: Correct return values within implementations of GetPollers()
...
In both cases, we weren't actually returning anything, which is
undefined behavior.
2019-03-18 11:40:38 -04:00
874826b6dd
input_common/sdl: Use a type alias to shorten declaration of GetPollers
...
Just makes the definitions a little bit more tidy.
2019-03-18 11:40:35 -04:00
114060fd87
input_common/sdl_impl: Make lambda capture more specific in SDLState constructor
...
We don't need to universally capture by reference. We specifically just
need to capture the this pointer.
2019-03-17 04:02:52 -04:00
d74aa13bd3
input_common/sdl_impl: Remove unnecessary std::chrono::duration construction
...
Specifying the time unit itself is sufficient here.
2019-03-17 04:02:52 -04:00
834d3fe336
input_common/sdl_impl: Remove unused variable in SDLState constructor
2019-03-17 04:02:48 -04:00
71817afbe9
fixup! Joystick: Allow for background events; Add deadzone to SDLAnalog
2019-03-02 19:12:46 +01:00
8b98f60e3c
input/sdl: lock map mutex after SDL call
...
Any SDL invocation can call the even callback on the same thread, which can call GetSDLJoystickBySDLID and eventually cause double lock on joystick_map_mutex. To avoid this, lock guard should be placed as closer as possible to the object accessing code, so that any SDL invocation is with the mutex unlocked
2019-03-02 19:09:58 +01:00
09ac66388c
Input: Remove global variables from SDL Input
...
Changes the interface as well to remove any unique methods that
frontends needed to call such as StartJoystickEventHandler by
conditionally starting the polling thread only if the frontend hasn't
started it already. Additionally, moves all global state into a single
SDLState class in order to guarantee that the destructors are called in
the proper order
2019-03-02 19:09:34 +01:00
c8554d218b
Input: Copy current SDL.h/cpp files to impl
...
This should make reviewing much easier as you can then see what changed
happened between the old file and the new one
2019-03-02 18:38:11 +01:00
b9238edd0d
common/math_util: Move contents into the Common namespace
...
These types are within the common library, so they should be within the
Common namespace.
2019-02-27 03:38:39 -05:00
1b855efd5e
common/vector_math: Move Vec[x] types into the Common namespace
...
These types are within the common library, so they should be using the
Common namespace.
2019-02-26 22:38:36 -05:00
a1574aabd5
common/quaternion: Move Quaternion into the Common namespace
...
Quaternion is within the common library, so it should be using the
Common namespace.
2019-02-26 22:31:17 -05:00
804115b2a4
Port #4141 from citra: Joystick hotplug support ( #1275 )
...
* Joystick hotplug support (#4141 )
* use SDL_PollEvent instead of SDL_JoystickUpdate
Register hot plugged controller by GUID if they were configured in a previous session
* Move SDL_PollEvent into its own thread
* Don't store SDLJoystick pointer in Input Device; Get pointer on each GetStatus call
* Fix that joystick_list gets cleared after SDL_Quit
* Add VirtualJoystick for InputDevices thats never nullptr
* fixup! Add VirtualJoystick for InputDevices thats never nullptr
* fixup! fixup! Add VirtualJoystick for InputDevices thats never nullptr
* Remove SDL_GameController, make SDL_Joystick* unique_ptr
* fixup! Remove SDL_GameController, make SDL_Joystick* unique_ptr
* Adressed feedback; fixed handling of same guid reconnects
* fixup! Adressed feedback; fixed handling of same guid reconnects
* merge the two joystick_lists into one
* make SDLJoystick a member of VirtualJoystick
* fixup! make SDLJoystick a member of VirtualJoystick
* fixup! make SDLJoystick a member of VirtualJoystick
* fixup! fixup! make SDLJoystick a member of VirtualJoystick
* SDLJoystick: Addressed review comments
* Address one missed review comment
2018-09-10 21:29:59 -04:00
684fc2c320
input_common: Use std::move where applicable
...
Avoids unnecessary atomic reference count increments and decrements
2018-08-02 21:51:11 -04:00
29b6afb82f
input_common: Add missing override specifiers
2018-08-02 21:44:25 -04:00
638956aa81
Rename logging macro back to LOG_*
2018-07-02 21:45:47 -04:00
376f6397c6
input_common: Move old logging macros over to fmt-capable ones
2018-04-26 19:09:25 -04:00
fae2dd0344
math_util: Remove the Clamp() function
...
C++17 adds clamp() to the standard library, so we can remove ours in
favor of it.
2018-04-20 10:14:13 -04:00
096be16636
Format: Run the new clang format on everything
2018-01-20 16:45:11 -07:00
be0e14ab3e
Merge pull request #84 from lioncash/cmake
...
CMakeLists: Derive the source directory grouping from targets themselves
2018-01-18 01:37:17 -05:00
e710a1b989
CMakeLists: Derive the source directory grouping from targets themselves
...
Removes the need to store to separate SRC and HEADER variables, and then
construct the target in most cases.
2018-01-17 21:51:43 -05:00
ed296e47f1
input_common/sdl: Silence a -Wpessimizing-move warning
2018-01-17 18:44:16 -05:00
eaff98dbb3
Adding meumart's Citra SDL Joystick support. Citra PR #3116
2018-01-15 20:02:30 -05:00
4d058cfb76
motion_emu: fix initialization order
2017-08-22 11:43:44 +03:00
bbfa9d0635
Merge pull request #2861 from wwylele/motion-refactor
...
Refactor MotionEmu into a InputDevice
2017-08-19 23:43:01 -06:00
223bd35450
motion_emu: no need to include thread in header
2017-08-19 07:21:02 +03:00
bf71fc0342
Fix Spelling/English mistakes
2017-08-14 09:15:39 +12:00
188194908c
move MotionEmu from core/frontend to input_common as a InputDevice
2017-08-11 11:05:08 +03:00
8d3f48d0a3
Fix some spelling mistakes
2017-08-11 19:51:16 +12:00
776cb91785
CMake: Define an interface target for SDL2 definitions
2017-05-27 21:38:49 -07:00
7b81903756
CMake: Correct inter-module dependencies and library visibility
...
Modules didn't correctly define their dependencies before, which relied
on the frontends implicitly including every module for linking to
succeed.
Also changed every target_link_libraries call to specify visibility of
dependencies to avoid leaking definitions to dependents when not
necessary.
2017-05-27 18:41:24 -07:00
4ad82f2e5a
input_common/sdl: add support for binding button to axis
2017-04-17 14:14:35 +03:00
5245c86f26
citra-qt: release all buttons when render window focus is lost
...
credit to @Hawkheart for the original idea
2017-03-17 21:41:25 +02:00
51b1c1f211
InputCommon: add SDL joystick support
2017-03-01 23:30:57 +02:00
a6bd7917cb
InputCommon: add AnalogFromButton
2017-03-01 23:30:57 +02:00
38e800f70d
InputCommon: add Keyboard
2017-03-01 23:30:57 +02:00
german
Lioncash
Morph
ameerj
Brian J. Tarricone
bunnei
Jan Beich
Ameer J
MerryMage
FearlessTobi
Markus Wick
ReinUsesLisp
James Rowe
CJBok
B3n30
Weiyi Wang
muemart
Dave Leaver
Yuri Kunde Schlesner