adapt guiKeyChangeMenu

y5nw · Jul 20, 2024 · ce94c62 · ce94c62
1 parent 21d33a9
commit ce94c62
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 22 deletions.
diff --git a/src/client/keycode.cpp b/src/client/keycode.cpp
@@ -369,12 +369,12 @@ const std::string KeyPress::sym() const
 
 const std::string KeyPress::name() const
 {
-	if (m_name.empty())
+	if (m_name.empty() && !has_modifier())
 		return "";
 	std::string ret;
 	if (valid_kcode(Key))
 		ret = lookup_keykey(Key).LangName;
-	else
+	else if (Char != L'\0')
 		ret = lookup_keychar(Char).LangName;
 	if (!ret.empty())
 		ret = strgettext(ret);

diff --git a/src/client/keycode.h b/src/client/keycode.h
@@ -57,6 +57,16 @@ class KeyPress
 			|| (Char == o.Char && Key == o.Key);
 	}
 
+	bool has_modifier() const
+	{
+		return shift || control;
+	}
+
+	bool valid_base() const
+	{
+		return valid_kcode(Key) || Char > 0;
+	}
+
 	int matches(const KeyPress &p) const;
 
 	const std::string sym() const;

diff --git a/src/gui/guiKeyChangeMenu.cpp b/src/gui/guiKeyChangeMenu.cpp
@@ -264,24 +264,20 @@ bool GUIKeyChangeMenu::resetMenu()
 }
 bool GUIKeyChangeMenu::OnEvent(const SEvent& event)
 {
-	if (event.EventType == EET_KEY_INPUT_EVENT && active_key
-			&& event.KeyInput.PressedDown) {
+	if (event.EventType == EET_KEY_INPUT_EVENT && active_key) {
+		if (!event.KeyInput.PressedDown) {
+			active_key = nullptr;
+			return true;
+		}
 
-		bool prefer_character = shift_down;
+		bool prefer_character = false;
 		KeyPress kp(event.KeyInput, prefer_character);
 
 		if (event.KeyInput.Key == irr::KEY_DELETE)
 			kp = KeyPress(""); // To erase key settings
 		else if (event.KeyInput.Key == irr::KEY_ESCAPE)
 			kp = active_key->key; // Cancel
 
-		bool shift_went_down = false;
-		if(!shift_down &&
-				(event.KeyInput.Key == irr::KEY_SHIFT ||
-				event.KeyInput.Key == irr::KEY_LSHIFT ||
-				event.KeyInput.Key == irr::KEY_RSHIFT))
-			shift_went_down = true;
-
 		// Display Key already in use message
 		bool key_in_use = false;
 		if (!kp.sym().empty()) {
@@ -309,13 +305,6 @@ bool GUIKeyChangeMenu::OnEvent(const SEvent& event)
 			active_key->key = kp;
 			active_key->button->setText(utf8_to_wide(kp.name()).c_str());
 
-			// Allow characters made with shift
-			if (shift_went_down){
-				shift_down = true;
-				return false;
-			}
-
-			active_key = nullptr;
 			return true;
 		}
 	} else if (event.EventType == EET_KEY_INPUT_EVENT && !active_key
@@ -356,7 +345,6 @@ bool GUIKeyChangeMenu::OnEvent(const SEvent& event)
 					}
 					FATAL_ERROR_IF(!active_key, "Key setting not found");
 
-					shift_down = false;
 					active_key->button->setText(wstrgettext("press key").c_str());
 					break;
 			}

diff --git a/src/gui/guiKeyChangeMenu.h b/src/gui/guiKeyChangeMenu.h
@@ -70,8 +70,6 @@ class GUIKeyChangeMenu : public GUIModalMenu
 
 	void add_key(int id, std::wstring button_name, const std::string &setting_name);
 
-	bool shift_down = false;
-
 	key_setting *active_key = nullptr;
 	gui::IGUIStaticText *key_used_text = nullptr;
 	std::vector<key_setting *> key_settings;