dwindows: mac/dw.m comparison

comparison mac/dw.m @ 2351:0c8d769df97e

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

comparison

equal deleted inserted replaced

-:5ddc447fb367
+:0c8d769df97e
 #define DWEventMaskLeftMouseDown NSEventMaskLeftMouseDown
 #define DWEventMaskRightMouseUp NSEventMaskRightMouseUp
 #define DWEventMaskRightMouseDown NSEventMaskRightMouseDown
 #define DWWindowStyleMaskResizable NSWindowStyleMaskResizable
 #define BUILDING_FOR_SIERRA
+#define HAVE_AVAILABLE
 #else
 #define DWButtonTypeSwitch NSSwitchButton
 #define DWButtonTypeRadio NSRadioButton
 #define DWButtonTypeMomentaryPushIn NSMomentaryPushInButton
 #define DWBezelStyleRegularSquare NSRegularSquareBezelStyle
 }
 /* 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, *))
 {
 NSAppearanceName basicAppearance = [appearance bestMatchFromAppearancesWithNames:@[
 return NSTerminateNow;
 }
 #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
 {
 NSUserNotificationCenter* unc = [NSUserNotificationCenter defaultUserNotificationCenter];
 unc.delegate = self;
 va_start(args, description);
 vsnprintf(outbuf, 1024, description, args);
 va_end(args);
 }
-#ifdef BUILDING_FOR_MOJAVE
+#ifdef HAVE_AVAILABLE
 /* Configure the notification's payload. */
 if (@available(macOS 10.14, *))
 {
 if([[NSBundle mainBundle] bundleIdentifier] != nil)
 {
 #ifdef BUILDING_FOR_MOUNTAIN_LION
 if(notification)
 {
 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, *))
 {
 if([[NSBundle mainBundle] bundleIdentifier] != nil)
 {
 [DWMainMenu retain];
 [DWApp setMainMenu:DWMainMenu];
 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)
 {
 UNUserNotificationCenter *center = [UNUserNotificationCenter currentNotificationCenter];
 if(!_dw_app_id[0])
 {
 /* 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;
 }
 /*
 * Allocates a shared memory region with a name.
 * Parameters:
 NSString *nsprogram = [NSString stringWithUTF8String:program];
 NSWorkspace *ws = [NSWorkspace sharedWorkspace];
 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])
 {
 NSString *thisfile = [NSString stringWithUTF8String:params[z]];
 }
 [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
 {
 SEL sofwa = NSSelectorFromString(@"openFile:withApplication:");
 {
 NSString *file = [NSString stringWithUTF8String:params[z]];
 DWIMP iofwa = (DWIMP)[ws methodForSelector:sofwa];
 iofwa(ws, sofwa, file, nsprogram);
+ret = DW_ERROR_NONE;
 z++;
 }
 }
 }
 }
 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
 {
 SEL sla = NSSelectorFromString(@"launchApplication:");
 if([ws respondsToSelector:sla])
 {
 DWIMP ila = (DWIMP)[ws methodForSelector:sla];
 ila(ws, sla, nsprogram);
+ret = DW_ERROR_NONE;
 }
 }
 }
-ret = DW_ERROR_NONE;
 }
 else
 {
 /* Use AppleScript to Open Terminal.app or contact an existing copy,
 * and execute the command passed in params[].
 case DW_FEATURE_HTML_RESULT:
 case DW_FEATURE_CONTAINER_STRIPE:
 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, *))
 {
 /* Make sure DWApp is initialized */
 case DW_FEATURE_CONTAINER_STRIPE:
 case DW_FEATURE_MLE_WORD_WRAP:
 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, *))
 {
 /* Make sure DWApp is initialized */

Mercurial > dwindows

comparison mac/dw.m @ 2351:0c8d769df97e