fix high priority keyboard handling in non-fullscreen menus

toggle fullscreen etc. didn't work as they were never sent to the
keyboard controller as we are still refactoring code...

Author: FolkertVanVerseveld

game/src/engine.cpp

@@ -1177,6 +1177,8 @@ void Engine::eventloop(SDL &sdl, gfx::GLprogram &prog, GLuint vao) {
 
 				if ((mi && mi->menu) || (capture_keys() && !io.WantCaptureKeyboard))
 					kbp_down(keyctl.down(event.key));
+				else
+					keyctl.down_hp(event.key);
 				break;
 			case SDL_MOUSEBUTTONDOWN:
 				ImGui_ImplSDL2_ProcessEvent(&event);

game/src/engine/keyctl.cpp

@@ -68,45 +68,43 @@ void KeyboardController::clear(KeyboardMode mode) {
 	std::fill(state_tapped.begin(), state_tapped.end(), false);
 }
 
-GameKey KeyboardController::down(const SDL_KeyboardEvent &e) {
-	if (mode == KeyboardMode::fullscreen_menu) {
-		auto it = scan_keys.find(e.keysym.scancode);
-
-		if (it == scan_keys.end())
-			return GameKey::max;
-
-		GameKey k = it->second;
-		size_t idx = (size_t)k;
-
-		if (state[idx])
-			return GameKey::max; // no repeating keys
-
-		state[idx] = true;
-		state_tapped[idx] = false;
-		return k;
-	}
-
-	auto it = keys.find(e.keysym.sym);
-
-	if (it == keys.end())
+template<typename T> GameKey RegisterKey(const T t, std::map<T, GameKey> &kbmap, std::vector<bool> &state, std::vector<bool> &tapped)
+{
+	auto it = kbmap.find(t);
+	if (it == kbmap.end())
 		return GameKey::max;
 
 	GameKey k = it->second;
 	size_t idx = (size_t)k;
 
+	if (state[idx])
+		return GameKey::max; // no repeating keys
+
 	state[idx] = true;
-	state_tapped[idx] = false;
+	tapped[idx] = false;
+
 	return k;
 }
 
+GameKey KeyboardController::down_hp(const SDL_KeyboardEvent &e) {
+	return RegisterKey(e.keysym.scancode, scan_keys, state, state_tapped);
+}
+
+GameKey KeyboardController::down(const SDL_KeyboardEvent &e) {
+	if (mode == KeyboardMode::fullscreen_menu)
+		return RegisterKey(e.keysym.scancode, scan_keys, state, state_tapped);
+
+	return RegisterKey(e.keysym.sym, keys, state, state_tapped);
+}
+
 GameKey KeyboardController::up(const SDL_KeyboardEvent &e) {
-	if (mode == KeyboardMode::fullscreen_menu) {
-		auto it = scan_keys.find(e.keysym.scancode);
+	auto it0 = scan_keys.find(e.keysym.scancode);
 
-		if (it == scan_keys.end())
+	if (mode == KeyboardMode::fullscreen_menu || (it0 != scan_keys.end() && is_hp(it0->second))) {
+		if (it0 == scan_keys.end())
 			return GameKey::max;
 
-		GameKey k = it->second;
+		GameKey k = it0->second;
 		size_t idx = (size_t)k;
 
 		if (!state[idx]) {

game/src/engine/keyctl.hpp

@@ -42,6 +42,17 @@ enum class GameKey {
 	max,
 };
 
+static inline constexpr bool is_hp(GameKey k) {
+	switch (k) {
+	case GameKey::toggle_debug_window:
+	case GameKey::open_help:
+	case GameKey::toggle_fullscreen:
+		return true;
+	default:
+		return false;
+	}
+}
+
 class KeyboardController final {
 	std::vector<bool> state, state_tapped;
 	std::map<SDL_Scancode, GameKey> scan_keys;
@@ -52,6 +63,8 @@ class KeyboardController final {
 
 	void clear(KeyboardMode mode);
 
+	// High Priority. this is to accommodate for menus that still need to be converted
+	GameKey down_hp(const SDL_KeyboardEvent&);
 	GameKey down(const SDL_KeyboardEvent&);
 	GameKey up(const SDL_KeyboardEvent&);