From 425ab2e8bc4905959ecc5d38e042ee0e1c3e1771 Mon Sep 17 00:00:00 2001
From: Manolo Gouy <Manolo>
Date: Tue, 6 Feb 2018 17:26:11 +0000
Subject: Add support for detection and processing of clean program termination
 request.

The default handling of cmd-Q/Quit program under MacOS was to terminate the
program if all its windows are closed without returning from FLTK's event loop.
This was running against a strong design feature of FLTK that programs
should always complete their event loop and return from main() when cleanly
terminating.

In the new code for the MacOS platform, cmd-Q/Quit program no longer terminates
the program. Instead, the event loop is interrupted and a call to Fl::program_should_quit()
allows to detect that program termination has been requested, if necessary.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12647 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
---
 src/Fl.cxx                                   | 16 ++++++++++++++++
 src/Fl_System_Driver.cxx                     |  9 +++++++++
 src/Fl_cocoa.mm                              | 27 +++++++++++++++++++++------
 src/drivers/Darwin/Fl_Darwin_System_Driver.H |  4 +++-
 4 files changed, 49 insertions(+), 7 deletions(-)

(limited to 'src')

diff --git a/src/Fl.cxx b/src/Fl.cxx
index ca629ab94..e6af1297b 100644
--- a/src/Fl.cxx
+++ b/src/Fl.cxx
@@ -589,6 +589,22 @@ int Fl::ready()
   return screen_driver()->ready();
 }
 
+/** Run the event loop even without any mapped window if the platform supports it.
+ \return zero indicates the event loop has been terminated.
+ */
+int Fl::run_also_windowless() {
+  return Fl::system_driver()->run_also_windowless();
+}
+
+/** Wait for \p delay seconds or until an event occurs, even without any mapped window if the platform supports it.
+ \return non zero indicates the event loop should be terminated
+ */
+int Fl::wait_also_windowless(double delay) {
+  return Fl::system_driver()->wait_also_windowless(delay);
+}
+
+int Fl::program_should_quit_ = 0;
+
 ////////////////////////////////////////////////////////////////
 // Window list management:
 
diff --git a/src/Fl_System_Driver.cxx b/src/Fl_System_Driver.cxx
index c396c9e2f..62c5a765b 100644
--- a/src/Fl_System_Driver.cxx
+++ b/src/Fl_System_Driver.cxx
@@ -445,6 +445,15 @@ void Fl_System_Driver::gettime(time_t *sec, int *usec) {
   *usec = 0;
 }
 
+int Fl_System_Driver::run_also_windowless() {
+  return Fl::run();
+}
+
+int Fl_System_Driver::wait_also_windowless(double delay) {
+  Fl::wait(delay);
+  return Fl::first_window() != NULL;
+}
+
 //
 // End of "$Id$".
 //
diff --git a/src/Fl_cocoa.mm b/src/Fl_cocoa.mm
index f738c3221..5fbd2cbf2 100644
--- a/src/Fl_cocoa.mm
+++ b/src/Fl_cocoa.mm
@@ -832,9 +832,9 @@ static int do_queued_events( double time = 0.0 )
   }
   
   fl_unlock_function();
-  NSEvent *event = [NSApp nextEventMatchingMask:NSAnyEventMask 
-                                      untilDate:[NSDate dateWithTimeIntervalSinceNow:time] 
-                                         inMode:NSDefaultRunLoopMode dequeue:YES];  
+  NSEvent *event = [NSApp nextEventMatchingMask:NSAnyEventMask
+                                      untilDate:[NSDate dateWithTimeIntervalSinceNow:time]
+                                         inMode:NSDefaultRunLoopMode dequeue:YES];
   if (event != nil) {
     got_events = 1;
     [FLApplication sendEvent:event]; // will then call [NSApplication sendevent:]
@@ -1507,6 +1507,7 @@ static FLWindowDelegate *flwindowdelegate_instance = nil;
 - (void)applicationWillUnhide:(NSNotification *)notify;
 - (BOOL)application:(NSApplication *)theApplication openFile:(NSString *)filename;
 @end
+
 @implementation FLAppDelegate
 - (void)applicationDidFinishLaunching:(NSNotification *)notification
 {
@@ -1515,19 +1516,21 @@ static FLWindowDelegate *flwindowdelegate_instance = nil;
 - (NSApplicationTerminateReply)applicationShouldTerminate:(NSApplication*)sender
 {
   fl_lock_function();
-  NSApplicationTerminateReply reply = NSTerminateNow;
   while ( Fl_X::first ) {
     Fl_Window *win = Fl::first_window();
     if (win->parent()) win = win->top_window();
     Fl_Widget_Tracker wt(win); // track the window object
     Fl::handle(FL_CLOSE, win);
     if (wt.exists() && win->shown()) { // the user didn't close win
-      reply = NSTerminateCancel; // so we return to the main program now
       break;
     }
   }
   fl_unlock_function();
-  return reply;
+  if ( ! Fl::first_window() ) {
+    Fl::program_should_quit(1);
+    breakMacEventLoop(); // necessary when called through menu and in Fl::wait()
+  }
+  return NSTerminateCancel;
 }
 - (void)applicationDidBecomeActive:(NSNotification *)notify
 {
@@ -1716,6 +1719,18 @@ static void drain_dropped_files_list() {
   free(fname);
 }
 
+int Fl_Darwin_System_Driver::run_also_windowless() {
+  while (!Fl::program_should_quit()) {
+    Fl::wait(1e20);
+  }
+  return 0;
+}
+
+int Fl_Darwin_System_Driver::wait_also_windowless(double delay) {
+  if (!Fl::program_should_quit()) Fl::wait(delay);
+  return !Fl::program_should_quit();
+}
+
 /*
  * Install an open documents event handler...
  */
diff --git a/src/drivers/Darwin/Fl_Darwin_System_Driver.H b/src/drivers/Darwin/Fl_Darwin_System_Driver.H
index cec33d2a9..77f38efc0 100644
--- a/src/drivers/Darwin/Fl_Darwin_System_Driver.H
+++ b/src/drivers/Darwin/Fl_Darwin_System_Driver.H
@@ -4,7 +4,7 @@
 // Definition of Apple Darwin system driver
 // for the Fast Light Tool Kit (FLTK).
 //
-// Copyright 2010-2016 by Bill Spitzak and others.
+// Copyright 2010-2018 by Bill Spitzak and others.
 //
 // This library is free software. Distribution and use rights are outlined in
 // the file "COPYING" which should have been included with this file.  If this
@@ -81,6 +81,8 @@ public:
   virtual const char *meta_name();
   virtual const char *alt_name();
   virtual const char *control_name();
+  virtual int run_also_windowless();
+  virtual int wait_also_windowless(double delay);
 };
 
 #endif // FL_DARWIN_SYSTEM_DRIVER_H
-- 
cgit v1.2.3