Macintosh-Tools/macemu
1
0
Fork 0
mirror of https://github.com/kanjitalk755/macemu.git synced 2024-11-18 18:05:21 +00:00
Code Issues Projects Releases Wiki Activity

Sheet and fullscreen-safe input processing, small tidyup

Browse Source
This commit is contained in:
nigel 2002-05-30 12:50:21 +00:00
parent 3053defd16
commit fdac401a5a
2 changed files with 51 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BasiliskII/src/MacOSX/Controller.h
View File

@ -26,7 +26,6 @@
// If the application supports multiple windows, define this:
// #define ENABLE_MULTIPLE
//@interface Controller : NSObject
@interface Controller : NSApplication
{
#ifdef ENABLE_MULTIPLE
@ -48,6 +47,7 @@
- (IBAction) TerminateAll: (id)sender;
#endif
- (BOOL) isAnyEmulatorDisplayingSheets;
- (BOOL) isAnyEmulatorRunning;
- (short) emulatorCreatedCount; // If any emulator environments have been setup, count how many

69
BasiliskII/src/MacOSX/Controller.mm
View File

@ -66,14 +66,19 @@
- (void) sendEvent: (NSEvent *)event;
{
NSEventType type = [event type];
if ( type == NSKeyUp || type == NSKeyDown || type == NSFlagsChanged )
[self dispatchKeyEvent: event
type: type];
if ( [self isAnyEmulatorDisplayingSheets] || ! [self isAnyEmulatorRunning] )
[super sendEvent: event];
else
[self dispatchEvent: event
type: type];
{
NSEventType type = [event type];
if ( type == NSKeyUp || type == NSKeyDown || type == NSFlagsChanged )
[self dispatchKeyEvent: event
type: type];
else
[self dispatchEvent: event
type: type];
}
}
// NSApplication methods which are invoked through delegation
@ -144,18 +149,22 @@
for ( tmp = 0; tmp < [emulators count], ++tmp )
{
theEmulator = [emulators objectAtIndex: tmp];
if ( [ theEmulator isRunning ] && [[theEmulator window] isKeyWindow ] )
view = [theEmulator screen];
if ( [ theEmulator isRunning ] &&
( [[theEmulator window] isKeyWindow] || [view isFullScreen] ) )
break;
}
if ( tmp < [emulators count] ) // i.e. if we exited the for loop
#else
if ( FULLSCREEN ||
[theEmulator isRunning] && [[theEmulator window] isKeyWindow ] )
view = [theEmulator screen];
if ( [theEmulator isRunning] &&
( [[theEmulator window] isKeyWindow] || [view isFullScreen] ) )
#endif
{
view = [theEmulator screen];
NSLog(@"Got a key event - %d\n", [event keyCode]);
D(NSLog(@"Got a key event - %d\n", [event keyCode]));
switch ( type )
{
case NSKeyUp:
@ -182,6 +191,8 @@ NSLog(@"Got a key event - %d\n", [event keyCode]);
- (void) dispatchEvent: (NSEvent *)event
type: (NSEventType)type
{
EmulatorView *view;
#ifdef ENABLE_MULTIPLE
// We need to work out what window's Emulator should receive these messages
@ -191,20 +202,22 @@ NSLog(@"Got a key event - %d\n", [event keyCode]);
for ( tmp = 0; tmp < [emulators count], ++tmp )
{
theEmulator = [emulators objectAtIndex: tmp];
if ( [ theEmulator isRunning ] && [[theEmulator window] isMainWindow ] )
view = [theEmulator screen];
if ( [theEmulator isRunning] &&
( [[theEmulator window] isMainWindow] || [view isFullScreen] ) )
break;
}
if ( tmp < [emulators count] ) // i.e. if we exited the for loop
#else
if ( FULLSCREEN ||
( [theEmulator isRunning] && [[theEmulator window] isMainWindow ] ) )
view = [theEmulator screen];
if ( [theEmulator isRunning] &&
( [[theEmulator window] isMainWindow] || [view isFullScreen] ) )
#endif
{
EmulatorView *view = [theEmulator screen];
// if ( [view mouseInView] )
if ( [view mouseInView: event] || FULLSCREEN )
if ( [view mouseInView: event] )
{
switch ( type )
{
@ -278,6 +291,24 @@ NSLog(@"Got a key event - %d\n", [event keyCode]);
#endif
- (BOOL) isAnyEmulatorDisplayingSheets
{
#ifdef ENABLE_MULTIPLE
int tmp;
for ( tmp = 0; tmp < [emulators count], ++tmp )
if ( [[[emulators objectAtIndex: tmp] window] attachedSheet] )
break;
if ( tmp < [emulators count] ) // i.e. if we exited the for loop
#else
if ( [[theEmulator window] attachedSheet] )
#endif
return TRUE;
return FALSE;
}
- (BOOL) isAnyEmulatorRunning
{
#ifdef ENABLE_MULTIPLE