TouchScreenGUI: Add an exit / "ESC" button to the rare controls bar (luanti-org#13574)

Author: grorp

LICENSE.txt

@@ -87,6 +87,9 @@ DS:
   games/devtest/mods/soundstuff/sounds/soundstuff_sinus.ogg
   games/devtest/mods/testtools/textures/testtools_branding_iron.png
 
+grorp:
+  textures/base/pack/exit_btn.png
+
 License of Minetest source code
 -------------------------------
 

android/icons/exit_btn.svg

@@ -152,6 +152,7 @@ are placeholders intended to be overwritten by the game.
 * `debug_btn.png`
 * `gear_icon.png`
 * `rare_controls.png`
+* `exit_btn.png`
 
 Texture Overrides
 -----------------

doc/texture_packs.md

@@ -50,6 +50,11 @@ const char **joystick_imagenames = (const char *[]) {
 
 static irr::EKEY_CODE id2keycode(touch_gui_button_id id)
 {
+	// ESC isn't part of the keymap.
+	if (id == exit_id) {
+		return KEY_ESCAPE;
+	}
+
 	std::string key = "";
 	switch (id) {
 		case inventory_id:
@@ -548,9 +553,10 @@ void TouchScreenGUI::init(ISimpleTextureSource *tsrc)
 				+ (0.5 * button_size)),
 		AHBB_Dir_Left_Right, 2.0);
 
-	m_rarecontrolsbar.addButton(chat_id,      L"Chat", "chat_btn.png");
+	m_rarecontrolsbar.addButton(chat_id,      L"chat", "chat_btn.png");
 	m_rarecontrolsbar.addButton(inventory_id, L"inv",  "inventory_btn.png");
 	m_rarecontrolsbar.addButton(drop_id,      L"drop", "drop_btn.png");
+	m_rarecontrolsbar.addButton(exit_id,      L"exit", "exit_btn.png");
 
 	m_initialized = true;
 }

src/gui/touchscreengui.cpp

@@ -54,6 +54,7 @@ typedef enum
 	chat_id,
 	inventory_id,
 	drop_id,
+	exit_id,
 	joystick_off_id,
 	joystick_bg_id,
 	joystick_center_id