New input gui by ergo720 · Pull Request #1713 · Cxbx-Reloaded/Cxbx-Reloaded-legacy

ergo720 · 2019-09-01T23:37:27Z

This implements a new input GUI which completely replaces the old one. It uses Sdl input to handle all non XInput controllers (which are instead handled by XInput) and the keyboard is handled by DInput. The appropriate API is automatically selected so you don’t have to select it now like you had to with the old GUI. Code to support the mouse is present but disabled as it has an unresolved issue which leads to weird movements in games and needs more investigation. Rumble functionality has been implemented so your controllers can also vibrate now (tested with XInput, Sdl needs testing). I also made some changes to the Xbox XInput functions so you will want to retest many games to see if I haven’t accidentally broken something. Please note that, according to here JayFoxRox/xqemu#4 (comment) , not all games accept input from ports other than 1. So, if a game doesn’t accept input from a port, try to connect it to port 1 and if it works, than it’s not a regression/bug.

Edit: Ready for merge

…upport

RadWolfie · 2019-09-02T00:19:52Z

+// *  You should have recieved a copy of the GNU General Public License
+// *  along with this program; see the file COPYING.
+// *  If not, write to the Free Software Foundation, Inc.,
+// *  59 Temple Place - Suite 330, Bostom, MA 02111-1307, USA.


Boston* 😉

We can do this fix later on.

Didn't we already fix the Bostom=>Boston globally? If so, then it should be fixed here rather than in a later PR.

Nope, we didn't. Source:

https://github.com/Cxbx-Reloaded/Cxbx-Reloaded/blob/develop/src/gui/DlgAbout.h#L18

https://github.com/Cxbx-Reloaded/Cxbx-Reloaded/search?q=bostom&unscoped_q=bostom

You may had been thinking about XbSymbolDatabase which has the correction.

RadWolfie · 2019-09-02T00:36:00Z

Did we discussed about missing save/cancel buttons before? Ah found the mention about missing buttons. Well, it's also missing in this pull request.
https://github.com/Cxbx-Reloaded/Cxbx-Reloaded/pull/1558#issuecomment-472262510

~~If we're going to merge this without the missing, apply/cancel, buttons, then we'll need to open a new issue for it. Since I had not heard of general UI dialog always save the change.~~

Ignore this, native close button doesn't perform the save.

ergo720 · 2019-09-02T08:42:32Z

Did we discussed about missing save/cancel buttons before? Ah found the mention about missing buttons. Well, it's also missing in this pull request.
#1558 (comment)
If we're going to merge this without the missing, apply/cancel, buttons, then we'll need to open a new issue for it. Since I had not heard of general UI dialog always save the change.

I could, but I don't see the utility of adding a popup to the Clear button? I feel it would instead be an hindrance if every time the button is pressed, the popup shows up.
Ok, but with one change: the user must have provided a name for the profile. This is because empty profile names are not allowed and are used during profile searches.
Save/Apply/Cancel buttons weren't asked in that comment. Anyway, there's already a Save button in the GUI which does what you want, namely, saving your configuration, so adding another one is just confusing. Apply also feels unnecessary since the button is supposed to save your configuration without closing the window, which is what Save already does. Not sure about the Cancel button at the moment.

jeltaqq · 2019-09-02T10:29:27Z

Tested with Sdl
Working
Gunvalkyrie
Quantum Redshift
Not working (regression)
Tenerezza

I'm fond of the stick and D-Pad settings "Up down left right" like old GUI. In addition, the same order as the trigger can be set intuitively.

LukeUsher

Generally works well in the games I tested. Configuration is, much better than our current input manager/configuration.

One issue I had that is that the purpose of the 'profile' input is a little unclear: Do you think we could provide one preset profile so that users can configure and save their settings without having to come up with a profile name?

The purpose of the 'modifier' input is also unclear.

Another issue is that I was able to lose my configuration by doing the following:

Create a Profile, named 'Test'
Configure inputs as you desire
Save
Run the emulator, test config, it works
Open configuration editor, delete your profile, the configured inputs are still shown in the input fields
On closing the dialog, input was still working as configured
On re-opening the dialog, all input mappings were lost (due to not having a profile)

Is there any way we can avoid this scenario? Perhaps we can add some text to the dialog to explain how it should be used, or warn the user if they have configured inputs that do not belong/have not been save to a profile?

Additionally, it seems awkward having the order defined as 'Up, Down, Right, Left' rather than 'Up, Down, Left, Right'. probably just a personal preference, but it doesn't seem 'right'.

LukeUsher · 2019-09-02T10:19:48Z

+// *  You should have recieved a copy of the GNU General Public License
+// *  along with this program; see the file COPYING.
+// *  If not, write to the Free Software Foundation, Inc.,
+// *  59 Temple Place - Suite 330, Bostom, MA 02111-1307, USA.


Didn't we already fix the Bostom=>Boston globally? If so, then it should be fixed here rather than in a later PR.

RadWolfie · 2019-09-02T12:24:29Z

I could, but I don't see the utility of adding a popup to the Clear button? I feel it would instead be an hindrance if every time the button is pressed, the popup shows up.

Supposedly you have keyboard input in progress to setup then you had accidentally clear it. You'll have to manually re-input 25 fields. You can check if any inputs had occur then show the popup.

Ok, but with one change: the user must have provided a name for the profile. This is because empty profile names are not allowed and are used during profile searches.

👍 Yeah, users will be confuse why there's a profile name field. Then assume it's not necessary after setting up their inputs.

Save/Apply/Cancel buttons weren't asked in that comment. Anyway, there's already a Save button in the GUI which does what you want, namely, saving your configuration, so adding another one is just confusing. Apply also feels unnecessary since the button is supposed to save your configuration without closing the window, which is what Save already does. Not sure about the Cancel button at the moment.

After 2nd review, looks like the native close button just close it. Perhaps add a close button next to clear button?

RadWolfie · 2019-09-02T12:29:54Z

https://github.com/Cxbx-Reloaded/Cxbx-Reloaded/pull/1713#pullrequestreview-282515069

To follow up @LukeUsher's comment. Once saved then close/re-open, the profile name is blank which should be showing the profile name.

gandalfthewhite19890404 · 2019-09-03T05:26:44Z

What is "XInput Default" labeled button?
Settings are not saving until you create profile or choose (if you need reconfigure it later)
Modifier - what is it, thumb (analogue stick button)?

…itory

…itching and saving profiles in GUI

LukeUsher · 2019-09-04T16:37:42Z

I think it's still unclear that the user must type a profile name, and cannot simply configure-and-go.
Other than that, this is good and I think it can be merged after this is solved, perhaps by setting a default name if no profiles or present, or even just by adding some instruction text to the dialog.

RadWolfie · 2019-09-04T17:50:56Z

@LukeUsher There is current review change I had requested. Source: https://github.com/Cxbx-Reloaded/Cxbx-Reloaded/pull/1713#discussion_r319782952

Beside that, I had not re-test the recent change at the moment. I will test it out very soon.

RadWolfie · 2019-09-04T18:49:28Z

What is "XInput Default" labeled button?

Hmm, supposedly in the future. We may will have default setup for keyboard/mouse. So, it's better to use "Default" button and disable the button if using keyboard/mouse is selected.

Settings are not saving until you create profile or choose (if you need reconfigure it later)

Cause by inexperience users or forgot to save new change(s). We'll have to expect multiple false positive report for this. Plus complaints too.

ergo720 · 2019-09-04T19:00:59Z

I know that there are still issues and the work is still incomplete. I'm just pushing commits to allow early testing and discover eventual bugs sooner rather than later.

…le from window class

RadWolfie · 2019-09-05T18:45:16Z

As of commit a001e46, the GUI look complete to me even the recent GUI code changes too.

UPDATE: Okay I found one tiny issue, the rumble test doesn't stop until input UI are completely close.

ergo720 · 2019-09-05T19:07:18Z

I suppose that happens with SDL controllers? Because with my XInput controller it rumbles for a fixed amount of time and stops normally, independently of the input GUI. I don't have SDL controllers which support vibration so I can't see it myself.

RadWolfie

Tested with

Lego Star Wars 1 & 2
Just Cause
Star Wars of the Old Republic 1 & 2
Crazy Taxi 3 - High Roller

Titles above did not regress.

gandalfthewhite19890404 · 2019-09-06T11:11:15Z

"XInput Default" labeled button is present even with dinput/keyboard

ergo720 added 7 commits August 30, 2019 17:57

Added SDL2 submodule

5833261

Ported input gui code from lle_input_gui branch

4a00a99

Integrated input manager with the hle input code (untested)

902f61c

Bug fixes, added button binding removal to input gui, removed mouse s…

7be025d

…upport

Disable Steel Battalion project

84d8dbc

Updated copyright texts

0b1dd28

Removed empty else block and useless pragma once

82c9807

RadWolfie reviewed Sep 2, 2019

View reviewed changes

Comment thread src/common/input/DInputKeyboardMouse.cpp Outdated

RadWolfie reviewed Sep 2, 2019

View reviewed changes

Comment thread .gitmodules Outdated

RadWolfie reviewed Sep 2, 2019

View reviewed changes

Comment thread .gitmodules Outdated

LukeUsher reviewed Sep 2, 2019

View reviewed changes

Fix no input in Tenerezza

dcefc88

ergo720 added 6 commits September 3, 2019 11:45

Updates license.txt in copyright texts to point to the original repos…

815a9df

…itory

Renamed Modifier to L/R Click in Duke GUI

14af004

Clear bindings in GUI when a profile is deleted

7e086a8

Removed Load button, automatically assign profile to settings when sw…

977fefa

…itching and saving profiles in GUI

Set maximum text length to profile name

e6dbf8a

Make rumble window display the selected rumble binding when opening

26efe71

Check if profile was saved before closing, removed useless child hand…

87a25f2

…le from window class

ergo720 added 3 commits September 5, 2019 15:50

Added messagebox to clear button

ab81c86

Use SDL-mirror for SDL submodule

8e66f8e

Switched position of Left/Right buttons in gui

a001e46

RadWolfie reviewed Sep 5, 2019

View reviewed changes

Comment thread src/common/input/InputWindow.cpp

Set rumble state back to zero after rumble test ends

edc503e

RadWolfie approved these changes Sep 5, 2019

View reviewed changes

RadWolfie merged commit d8b0075 into Cxbx-Reloaded:develop Sep 5, 2019

ergo720 deleted the input_gui branch September 6, 2019 09:01

This was referenced Sep 6, 2019

Switch from legacy DirectInput API to modern input API #156

Open

Configure Controller Bugs #28

Closed

XInput to DirectInput needs restart #1255

Closed

RadWolfie mentioned this pull request Sep 25, 2019

Fix New GUI Input Breakage #1735

Merged

ergo720 mentioned this pull request Mar 20, 2020

Review old code in EmuXapi.cpp regarding Xinput api #1209

Closed

lorn10 mentioned this pull request Apr 23, 2021

Feature request: Build PCSX-Redux Windows binaries more Wine compatible grumpycoders/pcsx-redux#474

Closed

Conversation

ergo720 commented Sep 1, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

RadWolfie Sep 2, 2019

Choose a reason for hiding this comment

Uh oh!

LukeUsher Sep 2, 2019 • edited by RadWolfie Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

RadWolfie Sep 2, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

RadWolfie commented Sep 2, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

ergo720 commented Sep 2, 2019

Uh oh!

jeltaqq commented Sep 2, 2019

Uh oh!

LukeUsher left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

LukeUsher Sep 2, 2019 • edited by RadWolfie Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

RadWolfie commented Sep 2, 2019

Uh oh!

RadWolfie commented Sep 2, 2019

Uh oh!

gandalfthewhite19890404 commented Sep 3, 2019

Uh oh!

LukeUsher commented Sep 4, 2019

Uh oh!

RadWolfie commented Sep 4, 2019

Uh oh!

RadWolfie commented Sep 4, 2019

Uh oh!

ergo720 commented Sep 4, 2019

Uh oh!

RadWolfie commented Sep 5, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

ergo720 commented Sep 5, 2019

Uh oh!

RadWolfie left a comment

Choose a reason for hiding this comment

Uh oh!

gandalfthewhite19890404 commented Sep 6, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

ergo720 commented Sep 1, 2019 •

edited

Loading

LukeUsher Sep 2, 2019 •

edited by RadWolfie

Loading

RadWolfie Sep 2, 2019 •

edited

Loading

RadWolfie commented Sep 2, 2019 •

edited

Loading

LukeUsher left a comment •

edited

Loading

LukeUsher Sep 2, 2019 •

edited by RadWolfie

Loading

RadWolfie commented Sep 5, 2019 •

edited

Loading