From 7726ef1b05a57e03e6e12a34c290e382c8f3e889 Mon Sep 17 00:00:00 2001 From: nigel <> Date: Tue, 11 Mar 2003 11:31:01 +0000 Subject: [PATCH] Simplified (and sped up) mouse movement processing when in fullscreen mode. --- BasiliskII/src/MacOSX/Controller.mm | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/BasiliskII/src/MacOSX/Controller.mm b/BasiliskII/src/MacOSX/Controller.mm index 9a4457dd..ca8b775a 100644 --- a/BasiliskII/src/MacOSX/Controller.mm +++ b/BasiliskII/src/MacOSX/Controller.mm @@ -193,6 +193,7 @@ type: (NSEventType)type { EmulatorView *view; + BOOL fullScreen; #ifdef ENABLE_MULTIPLE // We need to work out what window's Emulator should receive these messages @@ -204,21 +205,23 @@ { theEmulator = [emulators objectAtIndex: tmp]; view = [theEmulator screen]; + fullScreen = [view isFullScreen]; if ( [theEmulator isRunning] && - ( [[theEmulator window] isMainWindow] || [view isFullScreen] ) ) + ( fullScreen || [[theEmulator window] isMainWindow] ) ) break; } if ( tmp < [emulators count] ) // i.e. if we exited the for loop #else view = [theEmulator screen]; + fullScreen = [view isFullScreen]; if ( [theEmulator isRunning] && - ( [[theEmulator window] isMainWindow] || [view isFullScreen] ) ) + ( fullScreen || [[theEmulator window] isMainWindow] ) ) #endif { - if ( [view mouseInView: event] ) + if ( fullScreen || [view mouseInView: event] ) { switch ( type ) { @@ -230,7 +233,10 @@ break; case NSLeftMouseDragged: case NSMouseMoved: - [view processMouseMove: event]; + if ( fullScreen ) + [view fullscreenMouseMove]; + else + [view processMouseMove: event]; break; default: [super sendEvent: event]; // NSApplication default