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.

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

Custom button analog fix #17433

Merged
merged 3 commits into from
May 8, 2023
Merged

Custom button analog fix #17433

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e078f61
Rename class CustomKey to CustomButton
hrydgard May 8, 2023
9623f51
Add back support for custom buttons to control analog inputs
hrydgard May 8, 2023
ce632ec
IniFile: Fix writing 64-bit hex values.
hrydgard May 8, 2023
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
4 changes: 3 additions & 1 deletion Common/Data/Format/IniFile.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
#include <cstdlib>
#include <cstdio>

#include <inttypes.h>

#ifndef _MSC_VER
#include <strings.h>
#endif
Expand Down Expand Up @@ -192,7 +194,7 @@ void Section::Set(const char* key, uint32_t newValue) {
}

void Section::Set(const char* key, uint64_t newValue) {
Set(key, StringFromFormat("0x%016lx", newValue).c_str());
Set(key, StringFromFormat("0x%016" PRIx64, newValue).c_str());
}

void Section::Set(const char* key, float newValue) {
Expand Down
2 changes: 2 additions & 0 deletions Core/ControlMapper.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -504,10 +504,12 @@ void ControlMapper::PSPKey(int deviceId, int pspKeyCode, int flags) {
if (flags & KEY_DOWN) {
virtKeys_[vk] = 1.0f;
onVKey(pspKeyCode, true);
onVKeyAnalog(deviceId, pspKeyCode, 1.0f);
}
if (flags & KEY_UP) {
virtKeys_[vk] = 0.0f;
onVKey(pspKeyCode, false);
onVKeyAnalog(deviceId, pspKeyCode, 0.0f);
}
} else {
// INFO_LOG(SYSTEM, "pspKey %d %d", pspKeyCode, flags);
Expand Down
2 changes: 1 addition & 1 deletion Core/ControlMapper.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class ControlMapper {

// Inject raw PSP key input directly, such as from touch screen controls.
// Combined with the mapped input. Unlike __Ctrl APIs, this supports
// virtual key codes, though not analog mappings.
// virtual key codes, including analog mappings.
void PSPKey(int deviceId, int pspKeyCode, int flags);

// Toggle swapping DPAD and Analog. Useful on some input devices with few buttons.
Expand Down
2 changes: 1 addition & 1 deletion UI/CustomButtonMappingScreen.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ class CustomButtonMappingScreen : public UIDialogScreenWithGameBackground {
public:
CustomButtonMappingScreen(const Path &gamePath, int id) : UIDialogScreenWithGameBackground(gamePath), id_(id) {}

const char *tag() const override { return "CustomKey"; }
const char *tag() const override { return "CustomButton"; }

void CreateViews() override;
void onFinish(DialogResult result) override;
Expand Down
12 changes: 6 additions & 6 deletions UI/GamepadEmu.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,11 +189,11 @@ bool PSPButton::Touch(const TouchInput &input) {
return retval;
}

bool CustomKey::IsDown() {
bool CustomButton::IsDown() {
return (toggle_ && on_) || (!toggle_ && pointerDownMask_ != 0);
}

void CustomKey::GetContentDimensions(const UIContext &dc, float &w, float &h) const {
void CustomButton::GetContentDimensions(const UIContext &dc, float &w, float &h) const {
MultiTouchButton::GetContentDimensions(dc, w, h);
if (invertedContextDimension_) {
float tmp = w;
Expand All @@ -202,7 +202,7 @@ void CustomKey::GetContentDimensions(const UIContext &dc, float &w, float &h) co
}
}

bool CustomKey::Touch(const TouchInput &input) {
bool CustomButton::Touch(const TouchInput &input) {
using namespace CustomKeyData;
bool lastDown = pointerDownMask_ != 0;
bool retval = MultiTouchButton::Touch(input);
Expand Down Expand Up @@ -233,7 +233,7 @@ bool CustomKey::Touch(const TouchInput &input) {
return retval;
}

void CustomKey::Update() {
void CustomButton::Update() {
MultiTouchButton::Update();
using namespace CustomKeyData;

Expand Down Expand Up @@ -825,10 +825,10 @@ UI::ViewGroup *CreatePadLayout(float xres, float yres, bool *pause, bool showPau
}
return nullptr;
};
auto addCustomButton = [=](const ConfigCustomButton& cfg, const char *key, const ConfigTouchPos &touch) -> CustomKey * {
auto addCustomButton = [=](const ConfigCustomButton& cfg, const char *key, const ConfigTouchPos &touch) -> CustomButton * {
using namespace CustomKeyData;
if (touch.show) {
auto aux = root->Add(new CustomKey(cfg.key, key, cfg.toggle, cfg.repeat, controllMapper,
auto aux = root->Add(new CustomButton(cfg.key, key, cfg.toggle, cfg.repeat, controllMapper,
g_Config.iTouchButtonStyle == 0 ? customKeyShapes[cfg.shape].i : customKeyShapes[cfg.shape].l, customKeyShapes[cfg.shape].i,
customKeyImages[cfg.image].i, touch.scale, customKeyShapes[cfg.shape].d, buttonLayoutParams(touch)));
aux->SetAngle(customKeyImages[cfg.image].r, customKeyShapes[cfg.shape].r);
Expand Down
4 changes: 2 additions & 2 deletions UI/GamepadEmu.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,9 +173,9 @@ UI::ViewGroup *CreatePadLayout(float xres, float yres, bool *pause, bool showPau
const int D_pad_Radius = 50;
const int baseActionButtonSpacing = 60;

class CustomKey : public MultiTouchButton {
class CustomButton : public MultiTouchButton {
public:
CustomKey(uint64_t pspButtonBit, const char *key, bool toggle, bool repeat, ControlMapper* controllMapper, ImageID bgImg, ImageID bgDownImg, ImageID img, float scale, bool invertedContextDimension, UI::LayoutParams *layoutParams)
CustomButton(uint64_t pspButtonBit, const char *key, bool toggle, bool repeat, ControlMapper* controllMapper, ImageID bgImg, ImageID bgDownImg, ImageID img, float scale, bool invertedContextDimension, UI::LayoutParams *layoutParams)
: MultiTouchButton(key, bgImg, bgDownImg, img, scale, layoutParams), pspButtonBit_(pspButtonBit), toggle_(toggle), repeat_(repeat), controlMapper_(controllMapper), on_(false), invertedContextDimension_(invertedContextDimension) {
}
bool Touch(const TouchInput &input) override;
Expand Down