Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

TouchTestScreen: Have 8 entries logged instead of 2.

Browse source
This commit is contained in:
Henrik Rydgård 2023-07-06 11:48:25 +02:00
parent 65125583f8
commit fc3f7da3af
4 changed files with 39 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Common/UI/UIScreen.h
View file

@ -43,12 +43,12 @@ public:
void deviceRestored() override;
virtual void touch(const TouchInput &touch);
virtual bool key(const KeyInput &touch);
virtual void axis(const AxisInput &touch);
virtual bool key(const KeyInput &key);
virtual void axis(const AxisInput &axis);
void UnsyncTouch(const TouchInput &touch) override;
bool UnsyncKey(const KeyInput &touch) override;
void UnsyncAxis(const AxisInput &touch) override;
bool UnsyncKey(const KeyInput &key) override;
void UnsyncAxis(const AxisInput &axis) override;
TouchInput transformTouch(const TouchInput &touch) override;

49
UI/ControlMappingScreen.cpp
View file

@ -630,6 +630,7 @@ void TouchTestScreen::touch(const TouchInput &touch) {
}
}
// TODO: Move this screen out into its own file.
void TouchTestScreen::CreateViews() {
using namespace UI;
@ -638,9 +639,7 @@ void TouchTestScreen::CreateViews() {
root_ = new LinearLayout(ORIENT_VERTICAL);
LinearLayout *theTwo = new LinearLayout(ORIENT_VERTICAL, new LinearLayoutParams(1.0f));
lastLastKeyEvent_ = theTwo->Add(new TextView("-", new LayoutParams(FILL_PARENT, WRAP_CONTENT)));
lastLastKeyEvent_->SetTextColor(0x80FFFFFF); // semi-transparent
lastKeyEvent_ = theTwo->Add(new TextView("-", new LayoutParams(FILL_PARENT, WRAP_CONTENT)));
lastKeyEvents_ = theTwo->Add(new TextView("-", new LayoutParams(FILL_PARENT, WRAP_CONTENT)));
root_->Add(theTwo);
@ -671,38 +670,48 @@ extern int display_xres;
extern int display_yres;
#endif
void TouchTestScreen::UpdateLogView() {
while (keyEventLog_.size() > 8) {
keyEventLog_.erase(keyEventLog_.begin());
}
std::string text;
for (auto &iter : keyEventLog_) {
text += iter + "\n";
}
if (lastKeyEvents_) {
lastKeyEvents_->SetText(text);
}
}
bool TouchTestScreen::key(const KeyInput &key) {
UIScreen::key(key);
char buf[512];
snprintf(buf, sizeof(buf), "Keycode: %d Device ID: %d [%s%s%s%s]", key.keyCode, key.deviceId,
(key.flags & KEY_IS_REPEAT) ? "REP" : "",
(key.flags & KEY_UP) ? "UP" : "",
(key.flags & KEY_DOWN) ? "DOWN" : "",
(key.flags & KEY_CHAR) ? "CHAR" : "");
if (lastLastKeyEvent_ && lastKeyEvent_) {
lastLastKeyEvent_->SetText(lastKeyEvent_->GetText());
lastKeyEvent_->SetText(buf);
}
keyEventLog_.push_back(buf);
UpdateLogView();
return true;
}
void TouchTestScreen::axis(const AxisInput &axis) {
// This is mainly to catch axis events that would otherwise get translated
// into arrow keys, since seeing keyboard arrow key events appear when using
// a controller would be confusing for the user.
// This just filters out accelerometer events. We show everything else.
if (IgnoreAxisForMapping(axis.axisId))
return;
const float AXIS_LOG_THRESHOLD = AXIS_BIND_THRESHOLD * 0.5f;
if (axis.value > AXIS_LOG_THRESHOLD || axis.value < -AXIS_LOG_THRESHOLD) {
char buf[512];
snprintf(buf, sizeof(buf), "Axis: %d (value %1.3f) Device ID: %d",
axis.axisId, axis.value, axis.deviceId);
// Null-check just in case they weren't created yet.
if (lastLastKeyEvent_ && lastKeyEvent_) {
lastLastKeyEvent_->SetText(lastKeyEvent_->GetText());
lastKeyEvent_->SetText(buf);
}
char buf[512];
snprintf(buf, sizeof(buf), "Axis: %d (value %1.3f) Device ID: %d",
axis.axisId, axis.value, axis.deviceId);
keyEventLog_.push_back(buf);
if (keyEventLog_.size() > 8) {
keyEventLog_.erase(keyEventLog_.begin());
}
UpdateLogView();
}
void TouchTestScreen::render() {

7
UI/ControlMappingScreen.h
View file

@ -22,6 +22,7 @@
#include <set>
#include <mutex>
#include <vector>
#include <string>
#include "Common/UI/View.h"
#include "Common/UI/UIScreen.h"
@ -165,10 +166,12 @@ protected:
};
TrackedTouch touches_[MAX_TOUCH_POINTS]{};
UI::TextView *lastKeyEvent_ = nullptr;
UI::TextView *lastLastKeyEvent_ = nullptr;
std::vector<std::string> keyEventLog_;
UI::TextView *lastKeyEvents_ = nullptr;
void CreateViews() override;
void UpdateLogView();
UI::EventReturn OnImmersiveModeChange(UI::EventParams &e);
UI::EventReturn OnRenderingBackend(UI::EventParams &e);

2
android/jni/app-android.cpp
View file

@ -1207,8 +1207,8 @@ extern "C" void Java_org_ppsspp_ppsspp_NativeApp_joystickAxis(
return;
AxisInput axis;
axis.axisId = (InputAxis)axisId;
axis.deviceId = (InputDeviceID)deviceId;
axis.axisId = (InputAxis)axisId;
axis.value = value;
NativeAxis(axis);