dwindows: mac/dw.m comparison

comparison mac/dw.m @ 1914:3872ab37297b

Fix numerous deprecation warnings building with SDK 10.12 Sierra.

author	bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date	Wed, 28 Sep 2016 18:36:53 +0000
parents	7e23f3dccb6b
children	a2a8145f3148

comparison

equal deleted inserted replaced

-:5d32be499016
+:3872ab37297b
 /*
 * Dynamic Windows:
 *          A GTK like implementation of the MacOS GUI using Cocoa
 *
-* (C) 2011-2015 Brian Smith <brian@dbsoft.org>
+* (C) 2011-2016 Brian Smith <brian@dbsoft.org>
 * (C) 2011 Mark Hessling <mark@rexx.org>
 *
 * Requires 10.5 or later.
 * clang -std=c99 -g -o dwtest -D__MAC__ -I. dwtest.c mac/dw.m -framework Cocoa -framework WebKit
 */
 id view = [[[event window] contentView] superview];
 NSEventType type = [event type];
 p = [view convertPoint:[event locationInWindow] toView:object];
+#ifdef MAC_OS_X_VERSION_10_12
+if(type == NSEventTypeRightMouseDown || type == NSEventTypeRightMouseUp)
+#else
 if(type == NSRightMouseDown || type == NSRightMouseUp)
+#endif
 {
 button = 2;
 }
+#ifdef MAC_OS_X_VERSION_10_12
+else if(type == NSEventTypeOtherMouseDown || type == NSEventTypeOtherMouseDown)
+#else
 else if(type == NSOtherMouseDown || type == NSOtherMouseUp)
+#endif
 {
 button = 3;
 }
+#ifdef MAC_OS_X_VERSION_10_12
+else if([event modifierFlags] & NSEventModifierFlagControl)
+#else
 else if([event modifierFlags] & NSControlKeyMask)
+#endif
 {
 button = 2;
 }
 }
 DWTID _dw_mutex_locked = (DWTID)-1;
 /* Send fake event to make sure the loop isn't stuck */
 void _dw_wakeup_app()
 {
+#ifdef MAC_OS_X_VERSION_10_12
+[DWApp postEvent:[NSEvent otherEventWithType:NSEventTypeApplicationDefined
+#else
 [DWApp postEvent:[NSEvent otherEventWithType:NSApplicationDefined
+#endif
 location:NSMakePoint(0, 0)
 modifierFlags:0
 timestamp:0
 windowNumber:0
 context:NULL
 if([bltsrc isMemberOfClass:[NSBitmapImageRep class]])
 {
 NSBitmapImageRep *rep = bltsrc;
 NSImage *image = [NSImage alloc];
 SEL siwc = NSSelectorFromString(@"initWithCGImage");
+#ifdef MAC_OS_X_VERSION_10_12
+NSCompositingOperation op = NSCompositingOperationSourceOver;
+#else
+NSCompositingOperation op = NSCompositeSourceOver;
+#endif
 if([image respondsToSelector:siwc])
 {
 IMP iiwc = [image methodForSelector:siwc];
 image = iiwc(image, siwc, [rep CGImage], NSZeroSize);
 }
 if(bltinfo->srcwidth != -1)
 {
 [image drawInRect:NSMakeRect(bltinfo->xdest, bltinfo->ydest, bltinfo->width, bltinfo->height)
 fromRect:NSMakeRect(bltinfo->xsrc, bltinfo->ysrc, bltinfo->srcwidth, bltinfo->srcheight)
-operation:NSCompositeSourceOver fraction:1.0];
+operation:op fraction:1.0];
 }
 else
 {
 [image drawAtPoint:NSMakePoint(bltinfo->xdest, bltinfo->ydest)
 fromRect:NSMakeRect(bltinfo->xsrc, bltinfo->ysrc, bltinfo->width, bltinfo->height)
-operation:NSCompositeSourceOver fraction:1.0];
+operation:op fraction:1.0];
 }
 [bltsrc release];
 [image release];
 }
 if([bltdest isMemberOfClass:[NSBitmapImageRep class]])
 @implementation DWWindow
 -(void)sendEvent:(NSEvent *)theEvent
 {
 int rcode = -1;
+#ifdef MAC_OS_X_VERSION_10_12
+if([theEvent type] == NSEventTypeKeyDown)
+#else
 if([theEvent type] == NSKeyDown)
+#endif
 {
 rcode = _event_handler(self, theEvent, 2);
 }
 if ( rcode != TRUE )
 [super sendEvent:theEvent];
 -(NSFont *)font { return font; }
 -(void)setSize:(NSSize)input { size = input; }
 -(NSSize)size { return size; }
 -(void)mouseDown:(NSEvent *)theEvent
 {
+#ifdef MAC_OS_X_VERSION_10_12
+if(![theEvent isMemberOfClass:[NSEvent class]] || !([theEvent modifierFlags] & NSEventModifierFlagControl))
+#else
 if(![theEvent isMemberOfClass:[NSEvent class]] || !([theEvent modifierFlags] & NSControlKeyMask))
+#endif
 _event_handler(self, theEvent, 3);
 }
 -(void)mouseUp:(NSEvent *)theEvent { _event_handler(self, theEvent, 4); }
 -(NSMenu *)menuForEvent:(NSEvent *)theEvent { _event_handler(self, theEvent, 3); return nil; }
 -(void)rightMouseUp:(NSEvent *)theEvent { _event_handler(self, theEvent, 4); }
 [super keyUp:theEvent];
 }
 }
 -(BOOL)performKeyEquivalent:(NSEvent *)theEvent
 {
+#ifdef MAC_OS_X_VERSION_10_12
+if(([theEvent modifierFlags] & NSEventModifierFlagDeviceIndependentFlagsMask) == NSEventModifierFlagCommand)
+#else
 if(([theEvent modifierFlags] & NSDeviceIndependentModifierFlagsMask) == NSCommandKeyMask)
+#endif
 {
 if ([[theEvent charactersIgnoringModifiers] isEqualToString:@"x"])
 return [NSApp sendAction:@selector(cut:) to:[[self window] firstResponder] from:self];
 else if ([[theEvent charactersIgnoringModifiers] isEqualToString:@"c"])
 return [NSApp sendAction:@selector(copy:) to:[[self window] firstResponder] from:self];
 [super keyUp:theEvent];
 }
 }
 -(BOOL)performKeyEquivalent:(NSEvent *)theEvent
 {
+#ifdef MAC_OS_X_VERSION_10_12
+if(([theEvent modifierFlags] & NSEventModifierFlagDeviceIndependentFlagsMask) == NSEventModifierFlagControl)
+#else
 if(([theEvent modifierFlags] & NSDeviceIndependentModifierFlagsMask) == NSCommandKeyMask)
+#endif
 {
 if ([[theEvent charactersIgnoringModifiers] isEqualToString:@"x"])
 return [NSApp sendAction:@selector(cut:) to:[[self window] firstResponder] from:self];
 else if ([[theEvent charactersIgnoringModifiers] isEqualToString:@"c"])
 return [NSApp sendAction:@selector(copy:) to:[[self window] firstResponder] from:self];
 if(image != nil)
 {
 NSSize	imageSize;
 NSRect	imageFrame;
 SEL sdir = NSSelectorFromString(@"drawInRect:fromRect:operation:fraction:respectFlipped:hints:");
+#ifdef MAC_OS_X_VERSION_10_12
+NSCompositingOperation op = NSCompositingOperationSourceOver;
+#else
+NSCompositingOperation op = NSCompositeSourceOver;
+#endif
 imageSize = [image size];
 NSDivideRect(cellFrame, &imageFrame, &cellFrame, 3 + imageSize.width, NSMinXEdge);
 if ([self drawsBackground])
 {
 {
 IMP idir = [image methodForSelector:sdir];
 imageFrame.origin.y += ceil((cellFrame.size.height - imageFrame.size.height) / 2);
-idir(image, sdir, imageFrame, NSZeroRect, NSCompositeSourceOver, 1.0, YES, nil);
+idir(image, sdir, imageFrame, NSZeroRect, op, 1.0, YES, nil);
 }
 else
 {
 /* Old method for 10.5 */
 SEL sctp = NSSelectorFromString(@"compositeToPoint:operation:");
 if([image respondsToSelector:sctp])
 {
 IMP ictp = [image methodForSelector:sctp];
-ictp(image, sctp, imageFrame.origin, NSCompositeSourceOver);
+ictp(image, sctp, imageFrame.origin, op);
 }
 }
 }
 [super drawWithFrame:cellFrame inView:controlView];
 }
 -(void)setParent:(id)input { parent = input; }
 -(id)parent { return parent; }
 -(void)mouseDown:(NSEvent *)event
 {
 [super mouseDown:event];
+#ifdef MAC_OS_X_VERSION_10_12
+if([[NSApp currentEvent] type] == NSEventTypeLeftMouseUp)
+#else
 if([[NSApp currentEvent] type] == NSLeftMouseUp)
+#endif
 [self mouseUp:event];
 }
 -(void)mouseUp:(NSEvent *)event
 {
 [textfield takeIntValueFrom:self];
 [item setTarget:DWApp];
 item = [menu addItemWithTitle:NSLocalizedString(@"Hide Others", nil)
 action:@selector(hideOtherApplications:)
 keyEquivalent:@"h"];
+#ifdef MAC_OS_X_VERSION_10_12
+[item setKeyEquivalentModifierMask:NSEventModifierFlagCommand | NSEventModifierFlagOption];
+#else
 [item setKeyEquivalentModifierMask:NSCommandKeyMask | NSAlternateKeyMask];
+#endif
 [item setTarget:DWApp];
 item = [menu addItemWithTitle:NSLocalizedString(@"Show All", nil)
 action:@selector(unhideAllApplications:)
 keyEquivalent:@""];
 }
 /* Internal version that doesn't lock the run mutex */
 int _dw_main_iteration(NSDate *date)
 {
+#ifdef MAC_OS_X_VERSION_10_12
+NSEvent *event = [DWApp nextEventMatchingMask:NSEventMaskAny
+#else
 NSEvent *event = [DWApp nextEventMatchingMask:NSAnyEventMask
+#endif
 untilDate:date
 inMode:NSDefaultRunLoopMode
 dequeue:YES];
 if(event)
 {
 [alert addButtonWithTitle:button2];
 if(button3)
 [alert addButtonWithTitle:button3];
 va_end(args);
+#ifdef MAC_OS_X_VERSION_10_12
+if(flags & DW_MB_ERROR)
+[alert setAlertStyle:NSAlertStyleCritical];
+else if(flags & DW_MB_INFORMATION)
+[alert setAlertStyle:NSAlertStyleInformational];
+else
+[alert setAlertStyle:NSAlertStyleWarning];
+#else
 if(flags & DW_MB_ERROR)
 [alert setAlertStyle:NSCriticalAlertStyle];
 else if(flags & DW_MB_INFORMATION)
 [alert setAlertStyle:NSInformationalAlertStyle];
 else
 [alert setAlertStyle:NSWarningAlertStyle];
+#endif
 iResponse = [alert runModal];
 [alert release];
 switch(iResponse)
 {
 }
 [button setTarget:button];
 [button setAction:@selector(buttonClicked:)];
 [button setTag:cid];
 [button setButtonType:NSMomentaryPushInButton];
+#ifdef MAC_OS_X_VERSION_10_12
+[button setBezelStyle:NSBezelStyleRegularSquare];
+#else
 [button setBezelStyle:NSThickerSquareBezelStyle];
+#endif
 /* TODO: Reenable scaling in the future if it is possible on other platforms.
 [[button cell] setImageScaling:NSImageScaleProportionallyDown]; */
 if(DWDefaultFont)
 {
 [[button cell] setFont:DWDefaultFont];
 {
 DWButton *button = _button_new(text, cid);
 [button setButtonType:NSMomentaryPushInButton];
 [button setBezelStyle:NSRoundedBezelStyle];
 [button setImagePosition:NSNoImage];
+#ifdef MAC_OS_X_VERSION_10_12
+[button setAlignment:NSTextAlignmentCenter];
+#else
 [button setAlignment:NSCenterTextAlignment];
+#endif
 [[button cell] setControlTint:NSBlueControlTint];
 return button;
 }
 /*
 DWImageAndTextCell *browsercell = [[DWImageAndTextCell alloc] init];
 [column setDataCell:browsercell];
 [browsercell release];
 }
 /* Defaults to left justified so just handle right and center */
+#ifdef MAC_OS_X_VERSION_10_12
+if(flags[z] & DW_CFA_RIGHT)
+{
+[(NSCell *)[column dataCell] setAlignment:NSTextAlignmentRight];
+[(NSCell *)[column headerCell] setAlignment:NSTextAlignmentRight];
+}
+else if(flags[z] & DW_CFA_CENTER)
+{
+[(NSCell *)[column dataCell] setAlignment:NSTextAlignmentCenter];
+[(NSCell *)[column headerCell] setAlignment:NSTextAlignmentCenter];
+}
+#else
 if(flags[z] & DW_CFA_RIGHT)
 {
 [(NSCell *)[column dataCell] setAlignment:NSRightTextAlignment];
 [(NSCell *)[column headerCell] setAlignment:NSRightTextAlignment];
 }
 else if(flags[z] & DW_CFA_CENTER)
 {
 [(NSCell *)[column dataCell] setAlignment:NSCenterTextAlignment];
 [(NSCell *)[column headerCell] setAlignment:NSCenterTextAlignment];
 }
+#endif
 [column setEditable:NO];
 [cont addTableColumn:column];
 [cont addColumn:column andType:(int)flags[z]];
 [column release];
 }
 if(bubbletext)
 [item setToolTip:[NSString stringWithUTF8String:bubbletext]];
 [item setTarget:handle];
 [item setEnabled:YES];
 [item setHighlightMode:YES];
+#ifdef MAC_OS_X_VERSION_10_12
+[item sendActionOn:(NSEventMaskLeftMouseUp|NSEventMaskLeftMouseDown|NSEventMaskRightMouseUp|NSEventMaskRightMouseDown)];
+#else
 [item sendActionOn:(NSLeftMouseUpMask|NSLeftMouseDownMask|NSRightMouseUpMask|NSRightMouseDownMask)];
+#endif
 [item setAction:@selector(mouseDown:)];
 dw_window_set_data(handle, "_dw_taskbar", item);
 }
 /*
 }
 /* Function takes an NSImage and copies it into a flipped NSBitmapImageRep */
 void _flip_image(NSImage *tmpimage, NSBitmapImageRep *image, NSSize size)
 {
+#ifdef MAC_OS_X_VERSION_10_12
+NSCompositingOperation op =NSCompositingOperationSourceOver;
+#else
+NSCompositingOperation op =NSCompositeSourceOver;
+#endif
 [NSGraphicsContext saveGraphicsState];
 [NSGraphicsContext setCurrentContext:[NSGraphicsContext
 graphicsContextWithGraphicsPort:[[NSGraphicsContext graphicsContextWithBitmapImageRep:image] graphicsPort]
 flipped:YES]];
 [[[NSDictionary alloc] initWithObjectsAndKeys:image, NSGraphicsContextDestinationAttributeName, nil] autorelease];
 [t translateXBy:0.0 yBy:-size.height];
 /* Apply the transform */
 [t concat];
 [tmpimage drawAtPoint:NSMakePoint(0, 0) fromRect:NSMakeRect(0, 0, size.width, size.height)
-operation:NSCompositeSourceOver fraction:1.0];
+operation:op fraction:1.0];
 [NSGraphicsContext restoreGraphicsState];
 }
 /*
 * Creates a pixmap from a file.
 NSEvent *event = [DWApp currentEvent];
 if(!window)
 window = [event window];
 [thismenu autorelease];
 NSPoint p = NSMakePoint(x, [[NSScreen mainScreen] frame].size.height - y);
+#ifdef MAC_OS_X_VERSION_10_12
+NSEvent* fake = [NSEvent mouseEventWithType:NSEventTypeRightMouseDown
+#else
 NSEvent* fake = [NSEvent mouseEventWithType:NSRightMouseDown
+#endif
 location:_windowPointFromScreen(window, p)
 modifierFlags:0
 timestamp:[event timestamp]
 windowNumber:[window windowNumber]
 context:[NSGraphicsContext currentContext]
 [window setShown:YES];
 }
 [[window contentView] showWindow];
 [window makeKeyAndOrderFront:nil];
+#ifdef MAC_OS_X_VERSION_10_12
+if(!([window styleMask] & NSWindowStyleMaskResizable))
+#else
 if(!([window styleMask] & NSResizableWindowMask))
+#endif
 {
 /* Fix incorrect repeat in displaying textured windows */
 [window setAutorecalculatesContentBorderThickness:NO forEdge:NSMinYEdge];
 [window setContentBorderThickness:0.0 forEdge:NSMinYEdge];
 }

Mercurial > dwindows

comparison mac/dw.m @ 1914:3872ab37297b