Fix Alfredo window management

justindriggers · Mar 1, 2024 · 3d615b8 · 3d615b8
1 parent 641d998
commit 3d615b8
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 12 deletions.
diff --git a/alfredo/src/appkit/AlfredoApplicationDelegate.h b/alfredo/src/appkit/AlfredoApplicationDelegate.h
@@ -12,4 +12,5 @@
 @property(nonatomic, strong) NSWindow *window;
 @property(nonatomic, strong) MTKView *view;
 @property(nonatomic, retain) id<MTLDevice> device;
+@property(nonatomic) std::shared_ptr<LifecycleManager> lifecycleManager;
 @end
diff --git a/alfredo/src/appkit/AlfredoApplicationDelegate.mm b/alfredo/src/appkit/AlfredoApplicationDelegate.mm
@@ -75,6 +75,8 @@ - (void)applicationDidFinishLaunching:(NSNotification *)notification {
     [self.view setEnableSetNeedsDisplay:NO];
     ((CAMetalLayer*)[self.view layer]).displaySyncEnabled = NO;
 
+    self.lifecycleManager = std::make_shared<MacLifecycleManager>();
+
     auto mtkTextureLoader = [[MTKTextureLoader alloc] initWithDevice:self.device];
     auto metalTextureLoader = std::make_unique<MacMetalTextureLoader>(mtkTextureLoader);
     auto metalRenderBackend = render::MetalRenderBackend::create(*(__bridge MTK::View*)self.view, std::move(metalTextureLoader));
@@ -85,11 +87,10 @@ - (void)applicationDidFinishLaunching:(NSNotification *)notification {
     auto audioManager = std::make_shared<audio::AudioEngineAudioManager>(std::move(audioFileLoader));
     auto inputManager = std::make_shared<MacInputManager>();
     auto leaderboardManager = std::make_shared<MacLeaderboardManager>();
-    auto lifecycleManager = std::make_shared<MacLifecycleManager>();
     auto renderer = std::make_shared<Renderer>(std::move(metalRenderBackend));
     auto saveManager = std::make_shared<MacSaveManager>();
     auto timeManager = std::make_shared<MacTimeManager>();
-    auto engine = std::make_unique<Engine>(logger, audioManager, inputManager, leaderboardManager, lifecycleManager, renderer, saveManager, timeManager);
+    auto engine = std::make_unique<Engine>(logger, audioManager, inputManager, leaderboardManager, self.lifecycleManager, renderer, saveManager, timeManager);
 
     _viewDelegate = [[AlfredoViewDelegate alloc] initWithEngine:std::move(engine)];
 
@@ -101,10 +102,7 @@ - (void)applicationDidFinishLaunching:(NSNotification *)notification {
     [self.window makeKeyAndOrderFront:nil];
 
     [NSApp activateIgnoringOtherApps:YES];
-
-    while (lifecycleManager->isRunning()) {
-      [self.view draw];
-    }
+    [NSApp stop:nil];
   }
 }
 

diff --git a/alfredo/src/main.mm b/alfredo/src/main.mm
@@ -5,14 +5,16 @@
 using namespace linguine;
 
 int main(int argc, const char *argv[]) {
-  @autoreleasepool {
-    NSApplication *app = NSApplication.sharedApplication;
+  NSApplication *app = NSApplication.sharedApplication;
 
-    AlfredoApplicationDelegate *appDelegate = [[AlfredoApplicationDelegate alloc] init];
-    app.delegate = appDelegate;
+  AlfredoApplicationDelegate *appDelegate = [[AlfredoApplicationDelegate alloc] init];
+  app.delegate = appDelegate;
 
-    [app run];
+  [app run];
 
-    return 0;
+  while (appDelegate.lifecycleManager->isRunning()) {
+    [appDelegate.view draw];
   }
+
+  return 0;
 }
diff --git a/alfredo/src/platform/MacInputManager.mm b/alfredo/src/platform/MacInputManager.mm
@@ -43,6 +43,7 @@
 
           if (mouseLocation.x < 0.0f || mouseLocation.x > frameSize.width
               || mouseLocation.y < 0.0f || mouseLocation.y > frameSize.height) {
+            [app sendEvent:event];
             break;
           }
 
@@ -55,6 +56,7 @@
 
           if (mouseLocation.x < 0.0f || mouseLocation.x > frameSize.width
               || mouseLocation.y < 0.0f || mouseLocation.y > frameSize.height) {
+            [app sendEvent:event];
             break;
           }
 
@@ -72,6 +74,7 @@
 
           if (mouseLocation.x < 0.0f || mouseLocation.x > frameSize.width
               || mouseLocation.y < 0.0f || mouseLocation.y > frameSize.height) {
+            [app sendEvent:event];
             break;
           }
 
@@ -87,6 +90,7 @@
 
           if (mouseLocation.x < 0.0f || mouseLocation.x > frameSize.width
               || mouseLocation.y < 0.0f || mouseLocation.y > frameSize.height) {
+            [app sendEvent:event];
             break;
           }
 
@@ -105,6 +109,10 @@
             break;
           case kVK_ANSI_W:
             _keyStates[Key::W] = true;
+
+            if (event.modifierFlags & NSEventModifierFlagCommand) {
+              [app sendEvent:event];
+            }
             break;
           case kVK_ANSI_E:
             _keyStates[Key::E] = true;