rename settings, make keybindings work properly

set default secondary keybind

address review

fix whitespace

fix review comments

address reviews
Apply a compromise

remove excess newline in components.lua

address most review requests

fix whitespace errors

builtin/common/settings/components.lua

@@ -438,13 +438,43 @@ function make.key(setting)
 		if value == "" then
 			return height
 		end
+
+		local critical_keys = {
+			keymap_chat = true,
+			keymap_drop = true,
+			keymap_inventory = true,
+			keymap_cmd = true,
+			keymap_cmd_local = true,
+			keymap_dig = true,
+			keymap_place = true,
+		}
+
 		for _, o in ipairs(core.full_settingtypes) do
-			if o.type == "key" and o.name ~= setting.name and core.are_keycodes_equal(core.settings:get(o.name), value) then
+			if o.type == "key" and o.name ~= setting.name and
+					core.are_keycodes_equal(core.settings:get(o.name), value) then
+
+				local is_current_close_world = setting.name == "keymap_close_world"
+				local is_other_close_world = o.name == "keymap_close_world"
+
+				-- Current means current key you've messed with, other means the other key it conflicts with.
+				local is_current_critical = critical_keys[setting.name]
+				local is_other_critical = critical_keys[o.name]
+
+				local show_warning_current = false
+
+				if (is_current_close_world and is_other_critical)
+					or (is_other_close_world and is_current_critical)
+					or (not is_current_close_world and not is_other_close_world) then
+					show_warning_current = true
+				end
+
+				if show_warning_current then
 					table.insert(fs, ("label[0,%f;%s]"):format(height + 0.3,
 							core.colorize(mt_color_orange, fgettext([[Conflicts with "$1"]], fgettext(o.readable_name)))))
 					height = height + 0.6
 				end
 			end
+		end
 		return height
 	end
 	return {

builtin/settingtypes.txt

@@ -182,8 +182,6 @@ invert_hotbar_mouse_wheel (Hotbar: Invert mouse wheel direction) bool false
 
 [**Keybindings]
 
-keymap_close_game (Close game) key
-
 keymap_forward (Move forward) key SYSTEM_SCANCODE_26
 
 #    Will also disable autoforward, when active.
@@ -339,6 +337,10 @@ keymap_slot31 (Hotbar slot 31) key
 
 keymap_slot32 (Hotbar slot 32) key
 
+#    Modifier key bind for closing your world.
+#    Requires ESC + the selected key to work.
+keymap_close_world (Return to Main Menu) key SYSTEM_SCANCODE_225
+
 [*Touchscreen]
 
 #    Enables the touchscreen controls, allowing you to play the game with a touchscreen.

src/client/inputhandler.cpp

@@ -73,8 +73,6 @@ void MyEventReceiver::reloadKeybindings()
 		keybindings[KeyType::SLOT_1 + i] = getKeySetting(slot_key_name.c_str());
 	}
 
-	keybindings[KeyType::CLOSE_GAME] = getKeySetting("keymap_close_game");
-
 	// First clear all keys, then re-add the ones we listen for
 	keysListenedFor.clear();
 	for (int i = 0; i < KeyType::INTERNAL_ENUM_COUNT; i++) {
@@ -139,6 +137,7 @@ bool MyEventReceiver::OnEvent(const SEvent &event)
 	// This is separate from other keyboard handling so that it also works in menus.
 	if (event.EventType == EET_KEY_INPUT_EVENT) {
 		KeyPress keyCode(event.KeyInput);
+
 		if (keyCode == getKeySetting("keymap_fullscreen")) {
 			if (event.KeyInput.PressedDown && !fullscreen_is_down) {
 				IrrlichtDevice *device = RenderingEngine::get_raw_device();
@@ -152,7 +151,15 @@ bool MyEventReceiver::OnEvent(const SEvent &event)
 			}
 			fullscreen_is_down = event.KeyInput.PressedDown;
 			return true;
-		} else if (keyCode == getKeySetting("keymap_close_game") && event.KeyInput.PressedDown) {
+
+		} else if (keyCode == getKeySetting("keymap_close_world")) {
+			close_world_down = event.KeyInput.PressedDown;
+
+		} else if (keyCode == EscapeKey) {
+			esc_down = event.KeyInput.PressedDown;
+		}
+
+		if (esc_down && close_world_down) {
 			g_gamecallback->disconnect();
 			return true;
 		}

src/client/inputhandler.h

@@ -128,6 +128,9 @@ private:
 	// Intentionally not reset by clearInput/releaseAllKeys.
 	bool fullscreen_is_down = false;
 
+	bool close_world_down = false;
+	bool esc_down = false;
+
 	PointerType last_pointer_type = PointerType::Mouse;
 };
 

src/client/keys.h

@@ -97,7 +97,6 @@ public:
 		SLOT_32,
 
 		// Fake keycode for array size and internal checks
-		CLOSE_GAME,
 		INTERNAL_ENUM_COUNT
 
 	};

src/defaultsettings.cpp

@@ -134,7 +134,6 @@ void set_default_settings()
 #else
 #define USEKEY2(name, _, value) settings->setDefault(name, value)
 #endif
-	settings->setDefault("keymap_close_game", "");
 	USEKEY2("keymap_forward", "SYSTEM_SCANCODE_26", "KEY_KEY_W");
 	settings->setDefault("keymap_autoforward", "");
 	USEKEY2("keymap_backward", "SYSTEM_SCANCODE_22", "KEY_KEY_S");
@@ -220,6 +219,7 @@ void set_default_settings()
 	settings->setDefault("keymap_slot30", "");
 	settings->setDefault("keymap_slot31", "");
 	settings->setDefault("keymap_slot32", "");
+	USEKEY2("keymap_close_world", "SYSTEM_SCANCODE_225", "KEY_LSHIFT");
 
 #ifndef NDEBUG
 	// Default keybinds for quicktune in debug builds

src/settings_translation_file.cpp

@@ -1082,9 +1082,6 @@ fake_function() {
 	gettext("Chat message format");
 	gettext("Format of player chat messages. The following strings are valid placeholders:\n@name, @message, @timestamp (optional)");
 	gettext("Chat command time message threshold");
-	gettext("Close game");
-	gettext("Key for closing the game directly.");
-}
 	gettext("If the execution of a chat command takes longer than this specified time in\nseconds, add the time information to the chat command message");
 	gettext("Shutdown message");
 	gettext("A message to be displayed to all clients when the server shuts down.");