Better control profile for Retroid devices, minor fixes and cleanup

Common/CPUDetect.cpp

@@ -546,8 +546,6 @@ std::string CPUInfo::Summarize() {
 const char *GetCompilerABI() {
 #if PPSSPP_ARCH(ARMV7)
 	return "armeabi-v7a";
-#elif PPSSPP_ARCH(ARM)
-	return "armeabi";
 #elif PPSSPP_ARCH(ARM64)
 	return "arm64";
 #elif PPSSPP_ARCH(X86)

Common/Render/Text/draw_text_android.cpp

@@ -94,7 +94,7 @@ void TextDrawerAndroid::MeasureStringInternal(std::string_view str, float *w, fl
 	*w = (float)(size >> 16);
 	*h = (float)(size & 0xFFFF);
 
-	WARN_LOG(Log::G3D, "Measure Modified: '%.*s' size: %fx%f", (int)text.length(), text.data(), *w, *h);
+	// WARN_LOG(Log::G3D, "Measure Modified: '%.*s' size: %fx%f", (int)text.length(), text.data(), *w, *h);
 }
 
 bool TextDrawerAndroid::DrawStringBitmap(std::vector<uint8_t> &bitmapData, TextStringEntry &entry, Draw::DataFormat texFormat, std::string_view str, int align, bool fullColor) {
@@ -124,7 +124,7 @@ bool TextDrawerAndroid::DrawStringBitmap(std::vector<uint8_t> &bitmapData, TextS
 		imageWidth = 1;
 	if (imageHeight <= 0)
 		imageHeight = 1;
-	WARN_LOG(Log::G3D, "Text: '%.*s' (%02x)", (int)str.length(), str.data(), str[0]);
+	// WARN_LOG(Log::G3D, "Text: '%.*s' (%02x)", (int)str.length(), str.data(), str[0]);
 
 	jintArray imageData = (jintArray)env->CallStaticObjectMethod(cls_textRenderer, method_renderText, jstr, size);
 	env->DeleteLocalRef(jstr);

Common/UI/Context.cpp

@@ -78,7 +78,7 @@ void UIContext::Begin() {
 
 void UIContext::BeginNoTex() {
 	draw_->BindSamplerStates(0, 1, &sampler_);
-	UIBegin(ui_pipeline_notex_);
+	ui_draw2d.Begin(ui_pipeline_notex_);
 }
 
 void UIContext::BeginPipeline(Draw::Pipeline *pipeline, Draw::SamplerState *samplerState) {
@@ -89,7 +89,7 @@ void UIContext::BeginPipeline(Draw::Pipeline *pipeline, Draw::SamplerState *samp
 	Draw::Texture *textures[2]{};
 	draw_->BindTextures(1, 2, textures);
 	RebindTexture();
-	UIBegin(pipeline);
+	ui_draw2d.Begin(pipeline);
 }
 
 void UIContext::RebindTexture() const {

Common/UI/PopupScreens.cpp

@@ -141,12 +141,12 @@ void PopupMultiChoice::ChoiceCallback(int num) {
 		UI::EventParams e{};
 		e.v = this;
 		e.a = num;
+		e.b = PostChoiceCallback(num);
 		OnChoice.Trigger(e);
 
 		if (restoreFocus_) {
 			SetFocusedView(this);
 		}
-		PostChoiceCallback(num);
 	}
 }
 

Common/UI/PopupScreens.h

@@ -238,7 +238,7 @@ class PopupMultiChoice : public AbstractChoiceWithValueDisplay {
 	UI::EventReturn HandleClick(UI::EventParams &e);
 
 	void ChoiceCallback(int num);
-	virtual void PostChoiceCallback(int num) {}
+	virtual bool PostChoiceCallback(int num) { return true; }
 
 	I18NCat category_;
 	ScreenManager *screenManager_;
@@ -274,9 +274,15 @@ class PopupMultiChoiceDynamic : public PopupMultiChoice {
 	}
 
 protected:
-	void PostChoiceCallback(int num) override {
-		if (valueStr_) {
+	bool PostChoiceCallback(int num) override {
+		if (!valueStr_) {
+			return true;
+		}
+		if (*valueStr_ != choices_[num]) {
 			*valueStr_ = choices_[num];
+			return true;
+		} else {
+			return false;
 		}
 	}
 

Common/UI/UI.cpp

@@ -9,12 +9,3 @@
 
 // TODO: UI should probably not own these.
 DrawBuffer ui_draw2d;
-DrawBuffer ui_draw2d_front;
-
-void UIBegin(Draw::Pipeline *pipeline) {
-	ui_draw2d.Begin(pipeline);
-}
-
-void UIFlush() {
-	ui_draw2d.Flush();
-}

Common/UI/UI.h

@@ -57,9 +57,3 @@ class StringVectorListAdapter : public UIListAdapter {
 private:
 	const std::vector<std::string> *items_;
 };
-
-
-// Begins/flushes the two UI drawbuffers together.
-void UIBegin(Draw::Pipeline *shaderSet);
-void UIFlush();
-

Core/Config.cpp

@@ -726,6 +726,19 @@ static bool DefaultShowTouchControls() {
 	}
 }
 
+static bool DefaultShowPauseButton() {
+	switch (System_GetPropertyInt(SYSPROP_DEVICE_TYPE)) {
+	case DEVICE_TYPE_MOBILE:
+	case DEVICE_TYPE_DESKTOP:
+		return true;
+	case DEVICE_TYPE_VR:
+	case DEVICE_TYPE_TV:
+		return false;
+	default:
+		return false;
+	}
+}
+
 static const float defaultControlScale = 1.15f;
 static const ConfigTouchPos defaultTouchPosShow = { -1.0f, -1.0f, defaultControlScale, true };
 static const ConfigTouchPos defaultTouchPosHide = { -1.0f, -1.0f, defaultControlScale, false };
@@ -779,13 +792,9 @@ static const ConfigSetting controlSettings[] = {
 	ConfigSetting("fcombo18X", "fcombo18Y", "comboKeyScale18", "ShowComboKey18", &g_Config.touchCustom[18], defaultTouchPosHide, CfgFlag::PER_GAME),
 	ConfigSetting("fcombo19X", "fcombo19Y", "comboKeyScale19", "ShowComboKey19", &g_Config.touchCustom[19], defaultTouchPosHide, CfgFlag::PER_GAME),
 
-#if defined(_WIN32)
 	// A win32 user seeing touch controls is likely using PPSSPP on a tablet. There it makes
 	// sense to default this to on.
-	ConfigSetting("ShowTouchPause", &g_Config.bShowTouchPause, true, CfgFlag::DEFAULT),
-#else
-	ConfigSetting("ShowTouchPause", &g_Config.bShowTouchPause, false, CfgFlag::DEFAULT),
-#endif
+	ConfigSetting("ShowTouchPause", &g_Config.bShowTouchPause, &DefaultShowPauseButton, CfgFlag::DEFAULT),
 #if defined(USING_WIN_UI)
 	ConfigSetting("IgnoreWindowsKey", &g_Config.bIgnoreWindowsKey, false, CfgFlag::PER_GAME),
 #endif

Core/KeyMap.cpp

@@ -418,11 +418,11 @@ const KeyMap_IntStrPair psp_button_names[] = {
 	{VIRTKEY_AXIS_SWAP, "AxisSwap"},
 
 	{VIRTKEY_FASTFORWARD, "Fast-forward"},
+	{VIRTKEY_PAUSE, "Pause"},
 	{VIRTKEY_SPEED_TOGGLE, "SpeedToggle"},
 	{VIRTKEY_SPEED_CUSTOM1, "Alt speed 1"},
 	{VIRTKEY_SPEED_CUSTOM2, "Alt speed 2"},
 	{VIRTKEY_SPEED_ANALOG, "Analog speed"},
-	{VIRTKEY_PAUSE, "Pause"},
 	{VIRTKEY_RESET_EMULATION, "Reset"},
 	{VIRTKEY_FRAME_ADVANCE, "Frame Advance"},
 #if !defined(MOBILE_DEVICE)
@@ -734,7 +734,7 @@ void RestoreDefault() {
 	} else if (IsMOQII7S(name)) {
 		SetDefaultKeyMap(DEFAULT_MAPPING_MOQI_I7S, false);
 	} else if (IsRetroid(name)) {
-		SetDefaultKeyMap(DEFAULT_MAPPING_RETRO_STATION_CONTROLLER, false);
+		SetDefaultKeyMap(DEFAULT_MAPPING_RETROID_CONTROLLER, false);
 	} else {
 		SetDefaultKeyMap(DEFAULT_MAPPING_ANDROID_PAD, false);
 	}
@@ -855,7 +855,7 @@ void AutoConfForPad(const std::string &name) {
 	if (name.find("Xbox") != std::string::npos) {
 		SetDefaultKeyMap(DEFAULT_MAPPING_ANDROID_XBOX, false);
 	} else if (name == "Retro Station Controller") {
-		SetDefaultKeyMap(DEFAULT_MAPPING_RETRO_STATION_CONTROLLER, false);
+		SetDefaultKeyMap(DEFAULT_MAPPING_RETROID_CONTROLLER, false);
 	} else {
 		SetDefaultKeyMap(DEFAULT_MAPPING_ANDROID_PAD, false);
 	}

Core/KeyMapDefaults.cpp

@@ -200,29 +200,33 @@ static const DefMappingStruct defaultAndroidXboxControllerMap[] = {
 
 // Retroid reports its controller as "Retro Station Controller".
 // It's very similar to the Android Xbox mapping, just with main buttons swapped around.
-static const DefMappingStruct defaultRetroStationControllerMap[] = {
+static const DefMappingStruct defaultRetroidControllerMap[] = {
 	{CTRL_CROSS          , NKCODE_BUTTON_B},
 	{CTRL_CIRCLE         , NKCODE_BUTTON_A},
 	{CTRL_SQUARE         , NKCODE_BUTTON_Y},
 	{CTRL_TRIANGLE       , NKCODE_BUTTON_X},
-	// The hat for DPAD is standard for bluetooth pads, which is the most likely pads on Android I think.
+	{CTRL_LEFT           , JOYSTICK_AXIS_HAT_X, -1},
 	{CTRL_LEFT           , NKCODE_DPAD_LEFT},
+	{CTRL_RIGHT          , JOYSTICK_AXIS_HAT_X, +1},
 	{CTRL_RIGHT          , NKCODE_DPAD_RIGHT},
+	{CTRL_UP             , JOYSTICK_AXIS_HAT_Y, -1},
 	{CTRL_UP             , NKCODE_DPAD_UP},
+	{CTRL_DOWN           , JOYSTICK_AXIS_HAT_Y, +1},
 	{CTRL_DOWN           , NKCODE_DPAD_DOWN},
 	{CTRL_START          , NKCODE_BUTTON_START},
-	{CTRL_SELECT         , NKCODE_BACK},
+	{CTRL_SELECT         , NKCODE_BUTTON_SELECT},
 	{CTRL_LTRIGGER       , NKCODE_BUTTON_L1},
 	{CTRL_RTRIGGER       , NKCODE_BUTTON_R1},
+	{VIRTKEY_FASTFORWARD , NKCODE_BUTTON_R2},
 	{VIRTKEY_FASTFORWARD , JOYSTICK_AXIS_RTRIGGER, +1},
+	{VIRTKEY_PAUSE       , NKCODE_BUTTON_L2},
 	{VIRTKEY_PAUSE       , JOYSTICK_AXIS_LTRIGGER, +1},
 	{VIRTKEY_AXIS_X_MIN, JOYSTICK_AXIS_X, -1},
 	{VIRTKEY_AXIS_X_MAX, JOYSTICK_AXIS_X, +1},
 	{VIRTKEY_AXIS_Y_MIN, JOYSTICK_AXIS_Y, +1},
 	{VIRTKEY_AXIS_Y_MAX, JOYSTICK_AXIS_Y, -1},
 };
 
-
 static const DefMappingStruct defaultPadMapAndroid[] = {
 	{CTRL_CROSS          , NKCODE_BUTTON_A},
 	{CTRL_CIRCLE         , NKCODE_BUTTON_B},
@@ -415,8 +419,8 @@ void SetDefaultKeyMap(DefaultMaps dmap, bool replace) {
 	case DEFAULT_MAPPING_ANDROID_XBOX:
 		SetDefaultKeyMap(DEVICE_ID_PAD_0, defaultAndroidXboxControllerMap, ARRAY_SIZE(defaultAndroidXboxControllerMap), replace);
 		break;
-	case DEFAULT_MAPPING_RETRO_STATION_CONTROLLER:
-		SetDefaultKeyMap(DEVICE_ID_PAD_0, defaultRetroStationControllerMap, ARRAY_SIZE(defaultRetroStationControllerMap), replace);
+	case DEFAULT_MAPPING_RETROID_CONTROLLER:
+		SetDefaultKeyMap(DEVICE_ID_PAD_0, defaultRetroidControllerMap, ARRAY_SIZE(defaultRetroidControllerMap), replace);
 		break;
 	case DEFAULT_MAPPING_VR_HEADSET:
 		SetDefaultKeyMap(DEVICE_ID_XR_CONTROLLER_LEFT, defaultVRLeftController, ARRAY_SIZE(defaultVRLeftController), replace);

Core/KeyMapDefaults.h

@@ -13,7 +13,7 @@ enum DefaultMaps {
 	DEFAULT_MAPPING_OUYA,
 	DEFAULT_MAPPING_XPERIA_PLAY,
 	DEFAULT_MAPPING_MOQI_I7S,
-	DEFAULT_MAPPING_RETRO_STATION_CONTROLLER,
+	DEFAULT_MAPPING_RETROID_CONTROLLER,
 	DEFAULT_MAPPING_VR_HEADSET,
 };
 

Core/MIPS/JitCommon/JitBlockCache.cpp

@@ -87,7 +87,7 @@ JitBlockCache::~JitBlockCache() {
 bool JitBlock::ContainsAddress(u32 em_address) const {
 	// WARNING - THIS DOES NOT WORK WITH JIT INLINING ENABLED.
 	// However, that doesn't exist yet so meh.
-	return (em_address >= originalAddress && em_address < originalAddress + 4 * originalSize);
+	return em_address >= originalAddress && em_address < originalAddress + 4 * originalSize;
 }
 
 bool JitBlockCache::IsFull() const {
@@ -146,6 +146,8 @@ const JitBlock *JitBlockCache::GetBlock(int no) const {
 }
 
 int JitBlockCache::AllocateBlock(u32 startAddress) {
+	_assert_(num_blocks_ < MAX_NUM_BLOCKS);
+
 	JitBlock &b = blocks_[num_blocks_];
 
 	b.proxyFor = 0;
@@ -177,6 +179,8 @@ int JitBlockCache::AllocateBlock(u32 startAddress) {
 }
 
 void JitBlockCache::ProxyBlock(u32 rootAddress, u32 startAddress, u32 size, const u8 *codePtr) {
+	_assert_(num_blocks_ < MAX_NUM_BLOCKS);
+
 	// If there's an existing block at the startAddress, add rootAddress as a proxy root of that block
 	// instead of creating a new block.
 	int num = GetBlockNumberFromStartAddress(startAddress, false);

GPU/Common/DrawEngineCommon.cpp

@@ -806,6 +806,8 @@ int DrawEngineCommon::ComputeNumVertsToDecode() const {
 	return sum;
 }
 
+// Takes a list of consecutive PRIM opcodes, and extends the current draw call to include them.
+// This is just a performance optimization.
 int DrawEngineCommon::ExtendNonIndexedPrim(const uint32_t *cmd, const uint32_t *stall, u32 vertTypeID, bool clockwise, int *bytesRead, bool isTriangle) {
 	const uint32_t *start = cmd;
 	int prevDrawVerts = numDrawVerts_ - 1;

UI/GameSettingsScreen.cpp

@@ -1098,6 +1098,11 @@ void GameSettingsScreen::CreateSystemSettings(UI::ViewGroup *systemSettings) {
 	PopupMultiChoiceDynamic *theme = systemSettings->Add(new PopupMultiChoiceDynamic(&g_Config.sThemeName, sy->T("Theme"), GetThemeInfoNames(), I18NCat::THEMES, screenManager()));
 	theme->OnChoice.Add([=](EventParams &e) {
 		UpdateTheme(screenManager()->getUIContext());
+		// Reset the tint/saturation if the theme changed.
+		if (e.b) {
+			g_Config.fUITint = 0.0f;
+			g_Config.fUISaturation = 1.0f;
+		}
 		return UI::EVENT_CONTINUE;
 	});
 

UI/MainScreen.cpp

@@ -794,7 +794,9 @@ void GameBrowser::Refresh() {
 			topBar->Add(new Choice(ImageID("I_FOLDER_OPEN"), new LayoutParams(WRAP_CONTENT, 64.0f)))->OnClick.Handle(this, &GameBrowser::BrowseClick);
 #else
 			if ((browseFlags_ & BrowseFlags::BROWSE) && System_GetPropertyBool(SYSPROP_HAS_FOLDER_BROWSER)) {
-				topBar->Add(new Choice(mm->T("Browse"), ImageID("I_FOLDER_OPEN"), new LayoutParams(WRAP_CONTENT, 64.0f)))->OnClick.Handle(this, &GameBrowser::BrowseClick);
+				// Collapse the button title on very small screens (Retroid Pocket).
+				std::string_view browseTitle = g_display.pixel_xres <= 640 ? "" : mm->T("Browse");
+				topBar->Add(new Choice(browseTitle, ImageID("I_FOLDER_OPEN"), new LayoutParams(WRAP_CONTENT, 64.0f)))->OnClick.Handle(this, &GameBrowser::BrowseClick);
 			}
 			if (System_GetPropertyInt(SYSPROP_DEVICE_TYPE) == DEVICE_TYPE_TV) {
 				topBar->Add(new Choice(mm->T("Enter Path"), new LayoutParams(WRAP_CONTENT, 64.0f)))->OnClick.Add([=](UI::EventParams &) {

UI/Store.cpp

@@ -523,9 +523,9 @@ void StoreScreen::CreateViews() {
 	LinearLayout *topBar = root_->Add(new LinearLayout(ORIENT_HORIZONTAL, new LinearLayoutParams(FILL_PARENT, 64.0f)));
 	topBar->Add(new Choice(di->T("Back"), new LinearLayoutParams(WRAP_CONTENT, FILL_PARENT)))->OnClick.Handle<UIScreen>(this, &UIScreen::OnBack);
 	titleText_ = new TextView(mm->T("PPSSPP Homebrew Store"), ALIGN_VCENTER, false, new LinearLayoutParams(WRAP_CONTENT, FILL_PARENT));
+	titleText_->SetTextColor(screenManager()->getUIContext()->GetTheme().itemFocusedStyle.fgColor);
 	topBar->Add(titleText_);
-	UI::Drawable solid(0xFFbd9939);
-	topBar->SetBG(solid);
+	topBar->SetBG(screenManager()->getUIContext()->GetTheme().itemFocusedStyle.background);
 
 	LinearLayout *content;
 	if (connectionError_ || loading_) {

android/jni/Locals.mk

@@ -47,16 +47,6 @@ ifeq ($(findstring armeabi-v7a,$(TARGET_ARCH_ABI)),armeabi-v7a)
 
   LOCAL_CFLAGS := $(LOCAL_CFLAGS) -D_ARCH_32
 endif
-ifeq ($(TARGET_ARCH_ABI),armeabi)
-  LOCAL_LDLIBS += $(LOCAL_PATH)/../../ffmpeg/android/armv6/lib/libavformat.a
-  LOCAL_LDLIBS += $(LOCAL_PATH)/../../ffmpeg/android/armv6/lib/libavcodec.a
-  LOCAL_LDLIBS += $(LOCAL_PATH)/../../ffmpeg/android/armv6/lib/libswresample.a
-  LOCAL_LDLIBS += $(LOCAL_PATH)/../../ffmpeg/android/armv6/lib/libswscale.a
-  LOCAL_LDLIBS += $(LOCAL_PATH)/../../ffmpeg/android/armv6/lib/libavutil.a
-  LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../ffmpeg/android/armv6/include
-
-  LOCAL_CFLAGS := $(LOCAL_CFLAGS) -D_ARCH_32 -march=armv6
-endif
 
 ifeq ($(TARGET_ARCH_ABI),x86_64)
   LOCAL_LDLIBS += $(LOCAL_PATH)/../../ffmpeg/android/x86_64/lib/libavformat.a

android/src/org/ppsspp/ppsspp/PpssppActivity.java

@@ -29,7 +29,6 @@ public class PpssppActivity extends NativeActivity {
 	// Key used for debugging.
 	public static final String ARGS_EXTRA_KEY = "org.ppsspp.ppsspp.Args";
 
-	private static boolean m_hasUnsupportedABI = false;
 	private static boolean m_hasNoNativeBinary = false;
 
 	public static boolean libraryLoaded = false;
@@ -42,16 +41,12 @@ public class PpssppActivity extends NativeActivity {
 	private static final int STORAGE_ERROR_ALREADY_EXISTS = -4;
 
 	public static void CheckABIAndLoadLibrary() {
-		if (Build.CPU_ABI.equals("armeabi")) {
-			m_hasUnsupportedABI = true;
-		} else {
-			try {
-				System.loadLibrary("ppsspp_jni");
-				libraryLoaded = true;
-			} catch (UnsatisfiedLinkError e) {
-				Log.e(TAG, "LoadLibrary failed, UnsatifiedLinkError: " + e);
-				m_hasNoNativeBinary = true;
-			}
+		try {
+			System.loadLibrary("ppsspp_jni");
+			libraryLoaded = true;
+		} catch (UnsatisfiedLinkError e) {
+			Log.e(TAG, "LoadLibrary failed, UnsatifiedLinkError: " + e);
+			m_hasNoNativeBinary = true;
 		}
 	}
 
@@ -65,17 +60,13 @@ public PpssppActivity() {
 
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
-		if (m_hasUnsupportedABI || m_hasNoNativeBinary) {
+		if (m_hasNoNativeBinary) {
 			new Thread() {
 				@Override
 				public void run() {
 					Looper.prepare();
 					AlertDialog.Builder builder = new AlertDialog.Builder(PpssppActivity.this);
-					if (m_hasUnsupportedABI) {
-						builder.setMessage(Build.CPU_ABI + " target is not supported.").setTitle("Error starting PPSSPP").create().show();
-					} else {
-						builder.setMessage("The native part of PPSSPP for ABI " + Build.CPU_ABI + " is missing. Try downloading an official build?").setTitle("Error starting PPSSPP").create().show();
-					}
+					builder.setMessage("The native part of PPSSPP for ABI " + Build.CPU_ABI + " is missing. Try downloading an official build?").setTitle("Error starting PPSSPP").create().show();
 					Looper.loop();
 				}
 			}.start();

assets/lang/ar_AE.ini

@@ -1299,6 +1299,8 @@ JIT using IR = JIT using IR
 Language = ‎اللغة
 Loaded plugin: %1 = Loaded plugin: %1
 Memory Stick folder = Memory Stick folder
+Memory Stick in installed.txt = ‎installed.txt مسار الحفظ في
+Memory Stick in My Documents = ‎مسار الحفظ في مستنداتي
 Memory Stick size = Memory Stick size
 Change Nickname = ‎تغيير الأسم المستعار
 ChangingMemstickPath = Save games, save states, and other data will not be copied to this folder.\n\nChange the Memory Stick folder?
@@ -1362,8 +1364,6 @@ Reset Recording on Save/Load State = Reset recording on Save/Load state
 Restore Default Settings = ‎إلي الإفتراضي PPSSPP's إعادة إعدادات
 RetroAchievements = RetroAchievements
 Rewind Snapshot Interval = ‎ترجيع تردد اللقطة (يأكل الذاكرة)
-Save path in installed.txt = ‎installed.txt مسار الحفظ في
-Save path in My Documents = ‎مسار الحفظ في مستنداتي
 Savestate Slot = ‎منطقة حفظ الحالة
 Savestate slot backups = Savestate slot backups
 Screenshots as PNG = ‎PNG إحفظ لقطة الشاشة في صيغة