Start bringing back control map & menu checks.

The copy-paste fix to clib seems to have fixed them.
ceejbot · Dec 29, 2023 · 47b4d22 · 47b4d22
1 parent 499ac7b
commit 47b4d22
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 5 deletions.
diff --git a/src/controller/control.rs b/src/controller/control.rs
@@ -296,6 +296,10 @@ impl Controller {
     pub fn handle_key_event(&mut self, key: u32, button: &ButtonEvent) -> KeyEventResponse {
         let hotkey = Hotkey::from(key);
         let state = KeyState::from(button);
+        // log::info!(
+        //     "{key} {} {hotkey}  {state}",
+        //     char::from_u32(key).unwrap_or('X')
+        // );
         if matches!(hotkey, Hotkey::None) {
             return KeyEventResponse::default();
         }

diff --git a/src/main.cpp b/src/main.cpp
@@ -48,13 +48,14 @@ void message_callback(SKSE::MessagingInterface::Message* msg)
 				MenuHook::install();
 				PlayerHook::install();
 				papyrus::registerPapyrusFunctions();
+				registerAllListeners();
 			}
 			break;
 		case SKSE::MessagingInterface::kPostLoadGame:
+			rlog::info("SKSE kPostLoadGame message received: type={};"sv, static_cast<uint32_t>(msg->type));
 		case SKSE::MessagingInterface::kNewGame:
 			// rlog::debug("SKSE post load-game / new game callback; type={}"sv, static_cast<uint32_t>(msg->type));
-			rlog::info("SKSE kNewGame post-hook done: type={};"sv, static_cast<uint32_t>(msg->type));
-			registerAllListeners();
+			rlog::info("SKSE kNewGame message received: type={};"sv, static_cast<uint32_t>(msg->type));
 			initialize_hud();
 			break;
 		default: break;

diff --git a/src/plugin/sinks.cpp b/src/plugin/sinks.cpp
@@ -99,6 +99,7 @@ event_result KeyEventListener::ProcessEvent(RE::InputEvent* const* event_list,
 		// get chording events, so all the logic is now in the controller.
 		const KeyEventResponse response = handle_key_event(key, *button);
 		if (!response.handled) { continue; }
+		//rlog::info("mod handled key: {}", key);
 
 		if (response.stop_timer != Action::None)
 		{
@@ -115,6 +116,7 @@ event_result KeyEventListener::ProcessEvent(RE::InputEvent* const* event_list,
 		}
 
 		// Now wipe out the event data so nothing else acts on it.
+		// Is there a way to respond with                                                                                                                                                                                     `kStop` for just one event in the list?
 		button->idCode    = keycodes::kInvalid;
 		button->userEvent = "";
 	}  // end event handling for loop

diff --git a/src/util/helpers.cpp b/src/util/helpers.cpp
@@ -85,8 +85,12 @@ namespace helpers
 	bool playerInControl()
 	{
 		const auto* controlMap = RE::ControlMap::GetSingleton();
-		if (!controlMap) { return false; }
-		const auto canMove = controlMap->IsMovementControlsEnabled();
+		if (!controlMap)
+		{
+			rlog::info("no control map");
+			return false;
+		}
+		const auto canMove = controlMap->IsMovementControlsEnabled() && controlMap->IsActivateControlsEnabled();
 		return canMove;
 	}
 
@@ -105,7 +109,6 @@ namespace helpers
 		if (ui->GameIsPaused() || ui->IsMenuOpen("LootMenu")) return true;
 		if (!ui->IsCursorHiddenWhenTopmost() || !ui->IsShowingMenus() || !ui->GetMenu<RE::HUDMenu>()) { return true; }
 
-
 		// If we're not in control of the player character or otherwise not in gameplay, move on.
 		if (!playerInControl()) { return true; }
 		/*