GUI: Added configurable keyboard mappings to the project #174

flplv · 2020-02-26T00:44:17Z

This PR adds the support to configure the keybindings using the settings dialog.

It also rollback a recent commit that bound mouse button to the touch pad of the PS4 controller, now just go the settings screen and bind a key to the pad (@3kinox, please let me know if you accept this change).

Next feature I will develop is an autoclick functionality. Let me know where do you believe that should be, at GUI or chiaki library?

I suggest you review this PR commit by commit, so you can avoid reading some of the formatting fixes in the settings.cpp file.

juicypop · 2020-02-26T07:51:17Z

@flplv would this solve my issue #169?

flplv · 2020-02-26T08:33:57Z

I think yes, if the controllers are treated as digital keys. But no actual analog channel are supported. Sticks and L2, R2 are fixed values.

Does QT can read analog keys from usb or Bluetooth controllers?

thestr4ng3r

Very nice, I like the overall approach.
Please make sure to closely follow the formatting style of the rest of the code, especially the changes in settingsdialog.cpp are still wrongly formatted. You can use this as a reference: https://gist.github.com/thestr4ng3r/d0b1de10852ca3d119e8c83375211e4b

thestr4ng3r · 2020-02-26T11:12:04Z

gui/include/settings.h

+	CHIAKI_CONTROLLER_ANALOG_STICK_RIGHT_X_DOWN = (1 << 23),
+	CHIAKI_CONTROLLER_ANALOG_STICK_RIGHT_Y_UP = (1 << 24),
+	CHIAKI_CONTROLLER_ANALOG_STICK_RIGHT_Y_DOWN = (1 << 25),
+} SettingsExtendedAnalogStickEnum;


I think it would be better to differentiate these a bit more from the original definitions. I would do it like this (no typedef needed in C++):

enum class ControllerButtonExt { ANALOG_STICK_LEFT_X_UP = (1 << 18), ... };

Then later use it like static_cast<int>(ControllerButtonExt::ANALOG_STICK_LEFT_X_UP)

thestr4ng3r · 2020-02-26T11:12:17Z

gui/include/settings.h

 	Q_OBJECT

-	private:
+ 	private:


Unnecessary leading space

thestr4ng3r · 2020-02-26T11:12:24Z

gui/include/settings.h

@@ -41,14 +52,22 @@ class Settings : public QObject
 		void LoadManualHosts();
 		void SaveManualHosts();

-	public:
+ 	public:


leading space

thestr4ng3r · 2020-02-26T11:12:51Z

gui/include/settings.h

-
-		bool GetLogVerbose() const 				{ return settings.value("settings/log_verbose", false).toBool(); }
-		void SetLogVerbose(bool enabled)		{ settings.setValue("settings/log_verbose", enabled); }
+		bool GetDiscoveryEnabled() const {


Please keep the one-line formatting for these

thestr4ng3r · 2020-02-26T11:17:43Z

gui/include/settingskeycapturedialog.h

+		void KeyCaptured(Qt::Key);
+
+ 	protected:
+		void keyPressEvent(QKeyEvent *event) override;


This isn't used, so can be removed.

thestr4ng3r · 2020-02-26T11:17:51Z

gui/include/settingskeycapturedialog.h

+		void keyReleaseEvent(QKeyEvent *event) override;
+
+ 	public:
+		SettingsKeyCaptureDialog(QWidget *parent = nullptr);


Suggested change

SettingsKeyCaptureDialog(QWidget *parent = nullptr);

explicit SettingsKeyCaptureDialog(QWidget *parent = nullptr);

thestr4ng3r · 2020-02-26T11:20:38Z

gui/include/streamsession.h

@@ -47,6 +48,7 @@ class ChiakiException: public Exception

 struct StreamSessionConnectInfo
 {
+ 	Settings * settings;


This struct shouldn't depend on the actual Settings class. Better add a member of type QMap<Qt::Key, int> and extract the value in the StreamSessionConnectInfo(Settings *settings, QString host, QByteArray regist_key, QByteArray morning) constructor.

How do you feel about passing Settings * to StreamWindow constructor, in order to let it connect to a signal in Setttings that would be called KeyboardMapChanged? That would enable the user to change the mapping without having to reopen the stream.

or I can do what you say, but then at the same time connect the slot externally to StreamWindow. I think that would be better.

humm.. I realized that the StreamWindow is consuming all keypress, and not forwarding to other windows, so changing the key mapping while stream is on is not possible. Not sure if want to change this behavior.

thestr4ng3r · 2020-02-26T11:24:37Z

gui/src/settingskeycapturedialog.cpp

+
+void SettingsKeyCaptureDialog::keyReleaseEvent(QKeyEvent* event) {
+	KeyCaptured(Qt::Key(event->key()));
+	reject();


Suggested change

reject();

accept();

Doesn't change the behavior in this case, but accept makes more sense.

thestr4ng3r · 2020-02-26T11:32:19Z

gui/src/streamsession.cpp

+	bool press_event = event->type() == QEvent::Type::KeyPress;
+
+	if (press_event)
+		keyboard_state.buttons |= button;


keyboard_state.buttons should not be touched for the extended buttons. I think this whole if(press_event) could be moved into the default case of the switch below.

yes, you caught a bug, thanks.

thestr4ng3r · 2020-02-26T11:38:34Z

lib/include/chiaki/controller.h

@@ -56,6 +56,7 @@ typedef enum chiaki_controller_analog_button_t
 	CHIAKI_CONTROLLER_ANALOG_BUTTON_R2 = (1 << 17)
 } ChiakiControllerAnalogButton;

+


Unnecessary change

thestr4ng3r · 2020-02-26T11:44:27Z

The reason for the mouse click for touchpad button was that Linux by default handles the Dualshock's touchpad as a mouse-like touchpad so if you use the actual controller you could use the real touchpad button. Mapping it to a keyboard key wouldn't help here, so please keep it for now.

What exactly do you mean by "autoclick"? Something like a turbo button that automatically presses a button in a fast interval?

flplv · 2020-02-26T20:35:55Z

Ah got it, just paired my PS4 controller to the PC and saw the issue.

Where do you keep user manual? in the README? I believe a section speaking how the Desktop client can be used could be useful, specifically to point out that PS4 can be paired and or keyboard can be mapped.

Autoclick is a feature that I particularly use, and that was what drove me to this project. It is a timed automatic clicker for AFK gaming, it just periodically click a given button or sequence of buttons. It is useful for games like Minecraft. In Minecraft we use for AFK Fishing to level up and collect enchantment books. If you find it too specialized to the project, that is fine, I can keep it on my fork. But If you want the feature in the project, I'd add another entry in the settings menu where the user can configure the timer and the button to auto click, then the internals of the autoclick could go either in the Gui or in the shared library.

I will make some commits to address your inputs and I'll let you know.

3kinox · 2020-02-26T21:19:33Z

@flplv For the setting + touchpad fix, one way is simply to give the option to use any input types (key, controller button, mouse, or whatever) for binding. Not sure if you can do it straight in QT or not. Otherwise, a cleaner and more versatile fix could be to use SDL or evdev for all inputs, they should also give you control over analog vs numeric sticks/ R2-L2 (and rumble).

flplv · 2020-02-26T22:01:12Z

@flplv For the setting + touchpad fix, one way is simply to give the option to use any input types (key, controller button, mouse, or whatever) for binding. Not sure if you can do it straight in QT or not. Otherwise, a cleaner and more versatile fix could be to use SDL or evdev for all inputs, they should also give you control over analog vs numeric sticks/ R2-L2 (and rumble).

That is a good idea. I will keep in mind for the next improve.

flplv · 2020-02-26T22:07:26Z

@thestr4ng3r I believe I addressed all your comments.

thestr4ng3r · 2020-02-29T14:27:43Z

Where do you keep user manual? in the README?

Yes, for now there is only the readme, but more extensive documentation is planned.

Autoclick is a feature that I particularly use, and that was what drove me to this project. It is a timed automatic clicker for AFK gaming, it just periodically click a given button or sequence of buttons. It is useful for games like Minecraft. In Minecraft we use for AFK Fishing to level up and collect enchantment books. If you find it too specialized to the project, that is fine, I can keep it on my fork. But If you want the feature in the project, I'd add another entry in the settings menu where the user can configure the timer and the button to auto click, then the internals of the autoclick could go either in the Gui or in the shared library.

I see, well I'm not entirely sure I want that as part of the main project. But you can open an issue about it so we can discuss it in detail there.

thestr4ng3r · 2020-02-29T14:38:38Z

Thank you very much!
If you want to continue on this, a button to reset the key bindings to the default would be nice.

flplv mentioned this pull request Feb 26, 2020

There is no configuration screen (or #define) for keybindings on keyboard #13

Closed

thestr4ng3r suggested changes Feb 26, 2020

View reviewed changes

flplv mentioned this pull request Feb 26, 2020

Feature request: Controller Mapper #169

Open

flplv force-pushed the flplv/settings branch from 56be282 to 9b366da Compare February 26, 2020 22:06

flplv force-pushed the flplv/settings branch 2 times, most recently from f956fbc to 9f76359 Compare February 26, 2020 22:11

gui: Added settings for keyboard mapping

1c02b95

flplv force-pushed the flplv/settings branch from 9f76359 to 1c02b95 Compare February 26, 2020 22:13

Use enum class and revert some unrelated changess

e51aea3

thestr4ng3r merged commit a605ba0 into thestr4ng3r:master Feb 29, 2020

flplv deleted the flplv/settings branch March 4, 2020 18:59

thestr4ng3r mentioned this pull request Aug 11, 2020

Play with PC-keyboard #155

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

GUI: Added configurable keyboard mappings to the project #174

GUI: Added configurable keyboard mappings to the project #174

flplv commented Feb 26, 2020 •

edited

Loading

juicypop commented Feb 26, 2020

flplv commented Feb 26, 2020 •

edited

Loading

thestr4ng3r left a comment

thestr4ng3r Feb 26, 2020

thestr4ng3r Feb 26, 2020

thestr4ng3r Feb 26, 2020

thestr4ng3r Feb 26, 2020

thestr4ng3r Feb 26, 2020

thestr4ng3r Feb 26, 2020

thestr4ng3r Feb 26, 2020

flplv Feb 26, 2020

flplv Feb 26, 2020

flplv Feb 26, 2020

thestr4ng3r Feb 26, 2020

thestr4ng3r Feb 26, 2020

flplv Feb 26, 2020

thestr4ng3r Feb 26, 2020

thestr4ng3r commented Feb 26, 2020

flplv commented Feb 26, 2020

3kinox commented Feb 26, 2020

flplv commented Feb 26, 2020

flplv commented Feb 26, 2020

thestr4ng3r commented Feb 29, 2020

thestr4ng3r commented Feb 29, 2020

	SettingsKeyCaptureDialog(QWidget *parent = nullptr);
	explicit SettingsKeyCaptureDialog(QWidget *parent = nullptr);

		@@ -56,6 +56,7 @@ typedef enum chiaki_controller_analog_button_t
		CHIAKI_CONTROLLER_ANALOG_BUTTON_R2 = (1 << 17)
		} ChiakiControllerAnalogButton;

GUI: Added configurable keyboard mappings to the project #174

GUI: Added configurable keyboard mappings to the project #174

Conversation

flplv commented Feb 26, 2020 • edited Loading

juicypop commented Feb 26, 2020

flplv commented Feb 26, 2020 • edited Loading

thestr4ng3r left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

thestr4ng3r commented Feb 26, 2020

flplv commented Feb 26, 2020

3kinox commented Feb 26, 2020

flplv commented Feb 26, 2020

flplv commented Feb 26, 2020

thestr4ng3r commented Feb 29, 2020

thestr4ng3r commented Feb 29, 2020

flplv commented Feb 26, 2020 •

edited

Loading

flplv commented Feb 26, 2020 •

edited

Loading