Replace modal windows with floating child windows

Remove runModalForWindow: from all utility controllers. Each window
now uses setLevel:NSFloatingWindowLevel while open and reverts to
NSNormalWindowLevel on close, so it floats above the main emulator
window without blocking input. The Joystick configuration dialog is
a sub-dialog of the (already floating) Preferences window: it uses
addChildWindow:ordered:NSWindowAbove so the parent cannot rise above
its child by activation alone.

Add an Edit menu to MainMenu.xib so Cmd+C/V work in the debugger
entry field. Fix Debugger.xib hidesOnDeactivate and block the
emulation thread on a semaphore while the debugger is active.
debugger_run() in handleWillClose: only fires when debugger_active
is still 1 (user-initiated close); on Continue/Step the calling
action has already set debugger_mode via deactivate_debugger() and
a second debugger_run() would clobber a HALTED set by debugger_step().

Pin the emulation timer to the dedicated emulator thread via
performSelector:onThread: in pause/unpause. Without this the timer
ended up on whichever thread happened to call unpause (usually the
main thread, from deactivate_debugger), and the next debugger break
re-entered ui_debugger_activate on the main thread and deadlocked
in dispatch_semaphore_wait.

Author: morozov

fusepb/controllers/DebuggerController.m

@@ -58,6 +58,15 @@ - (void)mainThreadDebuggerDisassemble:(NSNumber *)address;
 /* Is the debugger window active (as opposed to the debugger itself)? */
 static int debugger_active;
 
+/* Set inside handleWillClose: while it transitively re-enters
+   deactivate_debugger() via debugger_run(); keeps that nested call from
+   re-issuing [window close] on a window that is already closing. */
+static int debugger_closing;
+
+/* Semaphore that blocks the emulation thread inside ui_debugger_activate()
+   until the user dismisses the debugger (Continue / close). */
+static dispatch_semaphore_t debugger_semaphore;
+
 @implementation DebuggerController
 
 static DebuggerController *singleton = nil;
@@ -102,6 +111,7 @@ - (id)init
     [super init];
     self = [super initWithWindowNibName:@"Debugger"];
     singleton = self;
+    debugger_semaphore = dispatch_semaphore_create( 0 );
 
     [self performSelectorOnMainThread:@selector(habdleCloseNotification) withObject:nil waitUntilDone:YES];
     [self performSelectorOnMainThread:@selector(setWindowFrameAutosaveName:) withObject:@"DebuggerWindow" waitUntilDone:YES];
@@ -131,6 +141,7 @@ - (void)dealloc
 
 - (void)handleWillClose:(NSNotification *)note
 {
+  debugger_closing = 1;
   [breakpointsContents release];
   breakpointsContents = nil;
   [dissasemblyContents release];
@@ -142,7 +153,12 @@ - (void)handleWillClose:(NSNotification *)note
   [memoryMapContents release];
   memoryMapContents = nil;
 
-  debugger_run();
+  /* Only resume execution when the user dismissed the window directly.
+     If we arrived via deactivate_debugger(), debugger_active is already
+     0 and the caller has set debugger_mode; calling debugger_run() now
+     would overwrite a HALTED set by debugger_step(). */
+  if( debugger_active ) debugger_run();
+  debugger_closing = 0;
 }
 
 - (void)eventsDoubleAction:(id)sender
@@ -191,13 +207,16 @@ - (void)debugger_activate:(id)sender
 {
   [[DisplayOpenGLView instance] pause];
 
+  [(NSPanel *)[singleton window] setBecomesKeyOnlyIfNeeded:NO];
   [singleton showWindow:nil];
+  [[singleton window] makeFirstResponder:entry];
+
+  [[singleton window] setLevel:NSFloatingWindowLevel];
 
   [continueButton setEnabled:YES];
   [breakButton setEnabled:NO];
   if( !debugger_active ) activate_debugger();
 
-  [NSApp runModalForWindow:[self window]];
 }
 
 - (void)debugger_deactivate:(int)interruptable
@@ -302,6 +321,13 @@ - (void)debugger_update_breakpoints
 
 - (void)debugger_update:(id)sender
 {
+  NSWindow *window = [singleton window];
+  NSText *fieldEditor = [window fieldEditor:NO forObject:entry];
+  NSResponder *currentFR = [window firstResponder];
+  BOOL entryWasFirstResponder = ( fieldEditor != nil && currentFR == fieldEditor );
+  NSString *savedText = entryWasFirstResponder ? [[fieldEditor string] copy] : nil;
+  NSRange savedSelection = entryWasFirstResponder ? [fieldEditor selectedRange] : NSMakeRange( 0, 0 );
+
   char buffer[40];
   NSString *format_16_bit, *format_8_bit;
   int capabilities;
@@ -519,6 +545,16 @@ - (void)debugger_update:(id)sender
   }
 
   [memoryMap reloadData];
+
+  if( entryWasFirstResponder ) {
+    [window makeFirstResponder:entry];
+    NSText *restoredEditor = [window fieldEditor:NO forObject:entry];
+    if( restoredEditor ) {
+      [restoredEditor setString:savedText];
+      [restoredEditor setSelectedRange:savedSelection];
+    }
+  }
+  [savedText release];
 }
 
 - (void)add_event:(event_t *)ptr
@@ -651,7 +687,11 @@ - (BOOL)tableView:(NSTableView *)aTableView shouldSelectRow:(int)rowIndex
 int
 ui_debugger_activate( void )
 {
-  [[Emulator instance] debuggerActivate];
+  [[Emulator instance] performSelectorOnMainThread:@selector(debuggerActivate)
+                                        withObject:nil
+                                     waitUntilDone:YES];
+
+  dispatch_semaphore_wait( debugger_semaphore, DISPATCH_TIME_FOREVER );
 
   return 0;
 }
@@ -721,10 +761,14 @@ - (BOOL)tableView:(NSTableView *)aTableView shouldSelectRow:(int)rowIndex
 
 static int
 deactivate_debugger( void )
-{ 
-  [NSApp stopModal];
+{
   debugger_active = 0;
+  [[singleton window] setLevel:NSNormalWindowLevel];
   [[DisplayOpenGLView instance] unpause];
+  dispatch_semaphore_signal( debugger_semaphore );
+  if( !debugger_closing && [[singleton window] isVisible] ) {
+    [[singleton window] close];
+  }
   return 0;
 }
 

fusepb/controllers/FuseController.m

@@ -1146,7 +1146,7 @@ - (IBAction)cocoa_break:(id)sender
   if ( gdbserver_debugging_enabled ) {
     return;
   }
-  if ( paused ) {
+  if ( paused || fuse_emulation_paused ) {
     debugger_mode = DEBUGGER_MODE_HALTED;
     paused = 0;
     [[DebuggerController singleton] debugger_activate:nil];

fusepb/controllers/JoystickConfigurationController.m

@@ -154,7 +154,10 @@ - (IBAction)apply:(id)sender;
 
 - (IBAction)cancel:(id)sender
 {
-  [NSApp stopModal];
+  NSWindow *parent = [[self window] parentWindow];
+  if( parent ) {
+    [parent removeChildWindow:[self window]];
+  }
   [[self window] close];
 }
 
@@ -165,8 +168,23 @@ - (void)showWindow:(id)sender
 
   joyNum = [sender tag];
 
+  /* Capture the parent before [super showWindow:] takes key status away. */
+  NSWindow *parent = [NSApp keyWindow];
+
   [super showWindow:sender];
 
+  /* Pin to the parent (Preferences) so this sub-dialog cannot be hidden
+     behind it when the parent is at NSFloatingWindowLevel. */
+  NSWindow *currentParent = [[self window] parentWindow];
+  if( parent != [self window] && currentParent != parent ) {
+    if( currentParent ) {
+      [currentParent removeChildWindow:[self window]];
+    }
+    if( parent ) {
+      [parent addChildWindow:[self window] ordered:NSWindowAbove];
+    }
+  }
+
   [joyXAxis removeAllItems];
   [joyYAxis removeAllItems];
 
@@ -375,8 +393,6 @@ - (void)showWindow:(id)sender
   default:
     assert(0);
   }
-
-  [NSApp runModalForWindow:[self window]];
 }
 
 @end

fusepb/controllers/LoadBinaryController.m

@@ -89,25 +89,30 @@ - (IBAction)apply:(id)sender
 
 - (IBAction)cancel:(id)sender
 {
-  [NSApp stopModal];
+  [[self window] setLevel:NSNormalWindowLevel];
   [[self window] close];
 
   [[DisplayOpenGLView instance] unpause];
 }
 
 - (void)showWindow:(id)sender
 {
+  if( [[self window] isVisible] ) {
+    [[self window] makeKeyAndOrderFront:sender];
+    return;
+  }
+
   [[DisplayOpenGLView instance] pause];
 
   [super showWindow:sender];
 
+  [[self window] setLevel:NSFloatingWindowLevel];
+
   [file setStringValue:@""];
   [start setStringValue:@""];
   [length setStringValue:@""];
 
   [apply setEnabled:NO];
-
-  [NSApp runModalForWindow:[self window]];
 }
 
 - (IBAction)chooseFile:(id)sender

fusepb/controllers/MemoryBrowserController.m

@@ -59,15 +59,18 @@ - (void)showWindow:(id)sender
   NSString *address;
   NSMutableString *hex, *data;
 
+  if( [[self window] isVisible] ) {
+    [[self window] makeKeyAndOrderFront:sender];
+    return;
+  }
+
   notificationObserver =
     [nc addObserverForName:@"NSWindowWillCloseNotification"
                     object:[self window]
                      queue:mainQueue
                 usingBlock:^(NSNotification *note) {
                   [nc removeObserver:notificationObserver];
 
-                  [NSApp stopModal];
-                
                   [tableContents removeAllObjects];
 
                   [tableContents release];
@@ -76,6 +79,8 @@ - (void)showWindow:(id)sender
 
                   [memoryBrowser reloadData];
 
+                  [[self window] setLevel:NSNormalWindowLevel];
+
                   [[DisplayOpenGLView instance] unpause];
                 }];
 
@@ -105,9 +110,9 @@ - (void)showWindow:(id)sender
 
   [super showWindow:sender];
 
+  [[self window] setLevel:NSFloatingWindowLevel];
+
   [memoryBrowser reloadData];
-  
-  [NSApp runModalForWindow:[self window]];
 }
 
 - (int)numberOfRowsInTableView:(NSTableView *)table

fusepb/controllers/PokeFinderController.m

@@ -94,22 +94,27 @@ - (void) dealloc
 
 - (void)handleWillClose:(NSNotification *)note
 {
-  [NSApp stopModal];
-
   [tableContents removeAllObjects];
   [tableContents release];
 
   tableContents = nil;
 
   [matchList reloadData];
 
+  [[self window] setLevel:NSNormalWindowLevel];
+
   [[DisplayOpenGLView instance] unpause];
 }
 
 - (void)showWindow:(id)sender
 {
   NSNotificationCenter *nc;
 
+  if( [[self window] isVisible] ) {
+    [[self window] makeKeyAndOrderFront:sender];
+    return;
+  }
+
   nc = [NSNotificationCenter defaultCenter];
   [nc addObserver:self
 	     selector:@selector(handleWillClose:)
@@ -120,9 +125,9 @@ - (void)showWindow:(id)sender
 
   [super showWindow:sender];
 
+  [[self window] setLevel:NSFloatingWindowLevel];
+
   [self update_pokefinder];
-  
-  [NSApp runModalForWindow:[self window]];
 }
 
 - (IBAction)search:(id)sender

fusepb/controllers/PokeMemoryController.m

@@ -51,8 +51,6 @@ - (id)init
                     object:[self window]
                      queue:mainQueue
                 usingBlock:^(NSNotification *note) {
-                  [NSApp stopModal];
-                
                   for( NSMutableDictionary* trainerModel in [trainersController content] ) {
                     trainer_t* trainer =
                       (trainer_t*)[[trainerModel valueForKey:@"trainerVal"] pointerValue];
@@ -67,6 +65,8 @@ - (id)init
 
                   [trainers reloadData];
 
+                  [[self window] setLevel:NSNormalWindowLevel];
+
                   [[DisplayOpenGLView instance] unpause];
                 }];
 
@@ -88,6 +88,11 @@ - (void)dealloc
 
 - (void)showWindow:(id)sender
 {
+  if( [[self window] isVisible] ) {
+    [[self window] makeKeyAndOrderFront:sender];
+    return;
+  }
+
   [[DisplayOpenGLView instance] pause];
 
   if( trainer_list ) {
@@ -96,9 +101,9 @@ - (void)showWindow:(id)sender
 
   [super showWindow:sender];
 
+  [[self window] setLevel:NSFloatingWindowLevel];
+
   [trainers reloadData];
-  
-  [NSApp runModalForWindow:[self window]];
 }
 
 - (void)addObjectToPokeList:(NSDictionary*)poke

fusepb/controllers/PreferencesController.m

@@ -142,6 +142,11 @@ - (void)awakeFromNib
 
 - (void)showWindow:(id)sender
 {
+  if( [[self window] isVisible] ) {
+    [[self window] makeKeyAndOrderFront:sender];
+    return;
+  }
+
   [[DisplayOpenGLView instance] pause];
 
   [machineRomsController setContent:nil];
@@ -157,6 +162,8 @@ - (void)showWindow:(id)sender
 
   [super showWindow:sender];
 
+  [[self window] setLevel:NSFloatingWindowLevel];
+
   [self setMassStorageType];
   [self setExternalSoundType];
 
@@ -166,12 +173,6 @@ - (void)showWindow:(id)sender
 		 selector:@selector(handleWillClose:)
 			 name:@"NSWindowWillCloseNotification"
 		   object:[self window]];
-
-  [NSApp runModalForWindow:[self window]];
-
-  [machineRomsController setContent:nil];
-  [machineRoms release];
-  machineRoms = nil;
 }
 
 - (void)fixPhantomTypistMode
@@ -200,8 +201,6 @@ - (void)fixPhantomTypistMode
 
 - (void)handleWillClose:(NSNotification *)note
 {
-  [NSApp stopModal];
-
   [[NSNotificationCenter defaultCenter] removeObserver:self];
 
   int old_bilinear = settings_current.bilinear_filter;
@@ -235,6 +234,12 @@ - (void)handleWillClose:(NSNotification *)note
     [Emulator endROMScopedAccess:romURLs];
   }
 
+  [machineRomsController setContent:nil];
+  [machineRoms release];
+  machineRoms = nil;
+
+  [[self window] setLevel:NSNormalWindowLevel];
+
   [[DisplayOpenGLView instance] unpause];
 }