Mercurial > dwindows

changeset 2351:0c8d769df97e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Mac: Added HAVE_AVAILABLE macro when building on a system with @available(). Use HAVE_AVAILABLE whenever we use @availabe() to test for availability instead of the macro for the code itself. Not sure if this will work, but if it does it will allow older systems to build for newer features. Also add ability to return the PID from dw_exec() in certain instances instead of just returning DW_ERROR_NONE when possible.
author bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date Fri, 05 Mar 2021 04:30:20 +0000
parents 5ddc447fb367
children 360f3cb6bd57
files mac/dw.m
diffstat 1 files changed, 27 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/mac/dw.m	Thu Mar 04 16:33:55 2021 +0000
+++ b/mac/dw.m	Fri Mar 05 04:30:20 2021 +0000
@@ -101,6 +101,7 @@
 #define DWEventMaskRightMouseDown NSEventMaskRightMouseDown
 #define DWWindowStyleMaskResizable NSWindowStyleMaskResizable
 #define BUILDING_FOR_SIERRA
+#define HAVE_AVAILABLE
 #else
 #define DWButtonTypeSwitch NSSwitchButton
 #define DWButtonTypeRadio NSRadioButton
@@ -436,7 +437,7 @@
 /* Returns TRUE of Mojave or later is in Dark Mode */
 BOOL _is_dark(id object)
 {
-#ifdef BUILDING_FOR_MOJAVE
+#ifdef HAVE_AVAILABLE
     NSAppearance *appearance = [object effectiveAppearance];
 
     if(@available(macOS 10.14, *))
@@ -1465,7 +1466,7 @@
 #if defined(BUILDING_FOR_MOUNTAIN_LION) && !defined(BUILDING_FOR_BIG_SUR)
 -(void)applicationDidFinishLaunching:(NSNotification *)aNotification
 {
-#ifdef BUILDING_FOR_MOJAVE
+#ifdef HAVE_AVAILABLE
     if (@available(macOS 10.14, *)) {} else
 #endif
     {
@@ -11147,7 +11148,7 @@
         va_end(args);
     }
 
-#ifdef BUILDING_FOR_MOJAVE
+#ifdef HAVE_AVAILABLE
     /* Configure the notification's payload. */
     if (@available(macOS 10.14, *))
     {
@@ -11212,7 +11213,7 @@
     {
         NSString *notid = [NSString stringWithFormat:@"dw-notification-%llu", DW_POINTER_TO_ULONGLONG(notification)];
         
-#ifdef BUILDING_FOR_MOJAVE
+#ifdef HAVE_AVAILABLE
         /* Schedule the notification. */
         if (@available(macOS 10.14, *))
         {
@@ -12527,7 +12528,7 @@
     DWObj = [[DWObject alloc] init];
     DWDefaultFont = nil;
     DWFontManager = [NSFontManager sharedFontManager];
-#ifdef BUILDING_FOR_MOJAVE
+#ifdef HAVE_AVAILABLE
     if (@available(macOS 10.14, *))
     {
         if([[NSBundle mainBundle] bundleIdentifier] != nil)
@@ -12566,7 +12567,7 @@
         /* Generate an Application ID based on the PID if all else fails. */
         snprintf(_dw_app_id, _DW_APP_ID_SIZE, "%s.pid.%d", DW_APP_DOMAIN_DEFAULT, getpid());
     }
-    return 0;
+    return DW_ERROR_NONE;
 }
 
 /*
@@ -12756,11 +12757,12 @@
 
         if(params && params[0] && params[1])
         {
-#ifdef BUILDING_FOR_CATALINA
+#ifdef HAVE_AVAILABLE
             if(@available(macOS 10.15, *))
             {
                 NSURL *url = _dw_url_from_program(nsprogram, ws);
                 NSMutableArray *array = [[NSMutableArray alloc] init];
+                __block DWDialog *dialog = dw_dialog_new(NULL);
                 int z = 1;
 
                 while(params[z])
@@ -12775,9 +12777,15 @@
                 [ws openURLs:array withApplicationAtURL:url
                                           configuration:[NSWorkspaceOpenConfiguration configuration]
                                       completionHandler:^(NSRunningApplication *app, NSError *error) {
+                    int pid = DW_ERROR_UNKNOWN;
+
                     if(error)
                         NSLog(@"openURLs: %@", [error localizedDescription]);
+                    else
+                        pid = [app processIdentifier];
+                    dw_dialog_dismiss(dialog, DW_INT_TO_POINTER(pid));
                 }];
+                ret = DW_POINTER_TO_INT(dw_dialog_wait(dialog));
             }
             else
 #endif
@@ -12794,6 +12802,7 @@
                         DWIMP iofwa = (DWIMP)[ws methodForSelector:sofwa];
 
                         iofwa(ws, sofwa, file, nsprogram);
+                        ret = DW_ERROR_NONE;
                         z++;
                     }
                 }
@@ -12801,17 +12810,24 @@
         }
         else
         {
-#ifdef BUILDING_FOR_CATALINA
+#ifdef HAVE_AVAILABLE
             if(@available(macOS 10.15, *))
             {
                 NSURL *url = _dw_url_from_program(nsprogram, ws);
+                __block DWDialog *dialog = dw_dialog_new(NULL);
 
                 [ws openApplicationAtURL:url
                            configuration:[NSWorkspaceOpenConfiguration configuration]
                        completionHandler:^(NSRunningApplication *app, NSError *error) {
+                    int pid = DW_ERROR_UNKNOWN;
+
                     if(error)
                         NSLog(@"openApplicationAtURL: %@", [error localizedDescription]);
+                    else
+                        pid = [app processIdentifier];
+                    dw_dialog_dismiss(dialog, DW_INT_TO_POINTER(pid));
                 }];
+                ret = DW_POINTER_TO_INT(dw_dialog_wait(dialog));
             }
             else
 #endif
@@ -12822,10 +12838,10 @@
                 {
                     DWIMP ila = (DWIMP)[ws methodForSelector:sla];
                     ila(ws, sla, nsprogram);
+                    ret = DW_ERROR_NONE;
                 }
             }
         }
-        ret = DW_ERROR_NONE;
     }
     else
     {
@@ -13132,7 +13148,7 @@
         case DW_FEATURE_MLE_WORD_WRAP:
         case DW_FEATURE_UTF8_UNICODE:
             return DW_FEATURE_ENABLED;
-#ifdef BUILDING_FOR_MOJAVE
+#ifdef HAVE_AVAILABLE
         case DW_FEATURE_DARK_MODE:
         {
             if(@available(macOS 10.14, *))
@@ -13195,7 +13211,7 @@
         case DW_FEATURE_UTF8_UNICODE:
             return DW_ERROR_GENERAL;
         /* These features are supported and configurable */
-#ifdef BUILDING_FOR_MOJAVE
+#ifdef HAVE_AVAILABLE
         case DW_FEATURE_DARK_MODE:
         {
             if(@available(macOS 10.14, *))