dwindows: mac/dw.m comparison

comparison mac/dw.m @ 2002:a2931caa3422

Fix setting/getting dates in dw_calendar under macos. Only tested on Mojave. Sorry about the white space changes.

author	mhessling@81767d24-ef19-dc11-ae90-00e081727c95
date	Mon, 04 Nov 2019 01:15:03 +0000
parents	289a8ca4855b
children	ebbdb2120659

comparison

equal deleted inserted replaced

-:f7acca46f795
+:a2931caa3422
 /* Returns TRUE of Mojave or later is in Dark Mode */
 BOOL _is_dark(id object)
 {
 #ifdef BUILDING_FOR_MOJAVE
 NSAppearance *appearance = [object effectiveAppearance];
 if(@available(macOS 10.14, *))
 {
 NSAppearanceName basicAppearance = [appearance bestMatchFromAppearancesWithNames:@[
 NSAppearanceNameAqua,
 NSAppearanceNameDarkAqua]];
 DWTID curr = pthread_self();
 if(DWThread == (DWTID)-1 || DWThread == curr)
 {
 DWIMP imp = (DWIMP)[self methodForSelector:sel];
 if(imp)
 imp(self, sel, param);
 }
 else
 [self performSelectorOnMainThread:sel withObject:param waitUntilDone:YES];
 {
 NSValue *bi = (NSValue *)param;
 DWBitBlt *bltinfo = (DWBitBlt *)[bi pointerValue];
 id bltdest = bltinfo->dest;
 id bltsrc = bltinfo->src;
 #ifdef BUILDING_FOR_MOJAVE
 if([bltdest isMemberOfClass:[DWRender class]])
 {
 DWRender *render = bltdest;
 bltdest = [render cachedDrawingRep];
 }
 #endif
 if([bltdest isMemberOfClass:[NSBitmapImageRep class]])
 {
 {
 NSBitmapImageRep *rep = bltsrc;
 NSImage *image = [NSImage alloc];
 SEL siwc = NSSelectorFromString(@"initWithCGImage");
 NSCompositingOperation op = DWCompositingOperationSourceOver;
 if([image respondsToSelector:siwc])
 {
 DWIMP iiwc = (DWIMP)[image methodForSelector:siwc];
 image = iiwc(image, siwc, [rep CGImage], NSZeroSize);
 }
 -(void)doFlush:(id)param
 {
 #ifdef BUILDING_FOR_MOJAVE
 NSEnumerator *enumerator = [_DWDirtyDrawables objectEnumerator];
 DWRender *rend;
 while (rend = [enumerator nextObject])
 rend.needsDisplay = YES;
 [_DWDirtyDrawables removeAllObjects];
 #else
 if(_DWLastDrawable)
 -(void)doWindowFunc:(id)param
 {
 NSValue *v = (NSValue *)param;
 void **params = (void **)[v pointerValue];
 void (* windowfunc)(void *);
 if(params)
 {
 windowfunc = params[0];
 if(windowfunc)
 {
 /* The 10.14 appkit warns this property does nothing... not sure
 * how long that has been the case but just removing it for Mojave.
 */
 #ifndef BUILDING_FOR_MOJAVE
 NSWindow *window = [render window];
 if([window preferredBackingLocation] != NSWindowBackingLocationVideoMemory)
 {
 [window setPreferredBackingLocation:NSWindowBackingLocationVideoMemory];
 }
 #endif
 /* Eliminate duplicate configure requests */
 if(oldsize.width != newsize.width || oldsize.height != newsize.height)
 {
 if(newsize.width > 0 && newsize.height > 0)
 {
 if(flags & DW_MB_ERROR)
 mstyle = DWAlertStyleCritical;
 else if(flags & DW_MB_INFORMATION)
 mstyle = DWAlertStyleInformational;
 params = [NSMutableArray arrayWithObjects:mtitle, mtext, [NSNumber numberWithInteger:mstyle], button1, button2, button3, nil];
 [DWObj safeCall:@selector(messageBox:) withObject:params];
 iResponse = [[params lastObject] integerValue];
 switch(iResponse)
 return [NSGraphicsContext graphicsContextWithCGContext:[[NSGraphicsContext graphicsContextWithBitmapImageRep:image] CGContext] flipped:YES];
 #else
 return [NSGraphicsContext graphicsContextWithGraphicsPort:[[NSGraphicsContext graphicsContextWithBitmapImageRep:image] graphicsPort] flipped:YES];
 #endif
 }
 /* Draw a point on a window (preferably a render window).
 * Parameters:
 *       handle: Handle to the window.
 *       pixmap: Handle to the pixmap. (choose only one of these)
 *       x: X coordinate.
 DW_FUNCTION_INIT;
 DW_LOCAL_POOL_IN;
 id image = handle;
 NSBitmapImageRep *bi = nil;
 bool bCanDraw = YES;
 if(pixmap)
 bi = image = (id)pixmap->image;
 else
 {
 #ifdef BUILDING_FOR_MOJAVE
 if([image isMemberOfClass:[DWRender class]])
 {
 DWRender *render = image;
 bi = [render cachedDrawingRep];
 }
 #else
 if((bCanDraw = [image lockFocusIfCanDraw]) == YES)
 _DWLastDrawable = handle;
 {
 #ifdef BUILDING_FOR_MOJAVE
 if([image isMemberOfClass:[DWRender class]])
 {
 DWRender *render = image;
 bi = [render cachedDrawingRep];
 }
 #else
 if((bCanDraw = [image lockFocusIfCanDraw]) == YES)
 _DWLastDrawable = handle;
 NSString *nstr = [ NSString stringWithUTF8String:text ];
 NSBitmapImageRep *bi = nil;
 NSFont *font = nil;
 DWRender *render;
 bool bCanDraw = YES;
 if(pixmap)
 {
 bi = image = (id)pixmap->image;
 font = pixmap->font;
 render = pixmap->handle;
 DW_LOCAL_POOL_IN;
 id image = handle;
 NSBitmapImageRep *bi = nil;
 bool bCanDraw = YES;
 int z;
 if(pixmap)
 bi = image = (id)pixmap->image;
 else
 {
 #ifdef BUILDING_FOR_MOJAVE
 if([image isMemberOfClass:[DWRender class]])
 {
 DWRender *render = image;
 bi = [render cachedDrawingRep];
 }
 #else
 if((bCanDraw = [image lockFocusIfCanDraw]) == YES)
 {
 {
 [aPath fill];
 }
 [aPath stroke];
 }
 if(bi)
 [NSGraphicsContext restoreGraphicsState];
 #ifndef BUILDING_FOR_MOJAVE
 if(bCanDraw == YES && !pixmap)
 [image unlockFocus];
 DW_FUNCTION_INIT;
 DW_LOCAL_POOL_IN;
 id image = handle;
 NSBitmapImageRep *bi = nil;
 bool bCanDraw = YES;
 if(pixmap)
 bi = image = (id)pixmap->image;
 else
 {
 #ifdef BUILDING_FOR_MOJAVE
 if([image isMemberOfClass:[DWRender class]])
 {
 DWRender *render = image;
 bi = [render cachedDrawingRep];
 }
 #else
 if((bCanDraw = [image lockFocusIfCanDraw]) == YES)
 {
 {
 id gc = _create_gc(bi, flags & DW_DRAW_NOAA ? NO : YES);
 [NSGraphicsContext saveGraphicsState];
 [NSGraphicsContext setCurrentContext:gc];
 }
 if(bCanDraw == YES)
 {
 NSColor *color = pthread_getspecific(_dw_fg_color_key);
 [color set];
 if(flags & DW_DRAW_FILL)
 [NSBezierPath fillRect:NSMakeRect(x, y, width, height)];
 else
 [NSBezierPath strokeRect:NSMakeRect(x, y, width, height)];
 }
 if(bi)
 [NSGraphicsContext restoreGraphicsState];
 #ifndef BUILDING_FOR_MOJAVE
 if(bCanDraw == YES && !pixmap)
 [image unlockFocus];
 DW_FUNCTION_INIT;
 DW_LOCAL_POOL_IN;
 id image = handle;
 NSBitmapImageRep *bi = nil;
 bool bCanDraw = YES;
 if(pixmap)
 bi = image = (id)pixmap->image;
 else
 {
 #ifdef BUILDING_FOR_MOJAVE
 if([image isMemberOfClass:[DWRender class]])
 {
 DWRender *render = image;
 bi = [render cachedDrawingRep];
 }
 #else
 if((bCanDraw = [image lockFocusIfCanDraw]) == YES)
 {
 {
 id gc = _create_gc(bi, flags & DW_DRAW_NOAA ? NO : YES);
 [NSGraphicsContext saveGraphicsState];
 [NSGraphicsContext setCurrentContext:gc];
 }
 if(bCanDraw)
 {
 NSBezierPath* aPath = [NSBezierPath bezierPath];
 NSColor *color = pthread_getspecific(_dw_fg_color_key);
 [color set];
 [aPath fill];
 }
 /* Actually do the drawing */
 [aPath stroke];
 }
 if(bi)
 [NSGraphicsContext restoreGraphicsState];
 #ifndef BUILDING_FOR_MOJAVE
 if(bCanDraw == YES && !pixmap)
 [image unlockFocus];
 DW_LOCAL_POOL_IN;
 snprintf(buffer, 100, "%04d-%02d-%02d", year, month, day);
 NSDateFormatter *dateFormatter = [[[NSDateFormatter alloc] init] autorelease];
-dateFormatter.dateFormat = @"yyyy-mm-dd";
+dateFormatter.dateFormat = @"yyyy-MM-dd";
 date = [dateFormatter dateFromString:[NSString stringWithUTF8String:buffer]];
 [calendar setDateValue:date];
 [date release];
 DW_LOCAL_POOL_OUT;
 */
 void dw_calendar_get_date(HWND handle, unsigned int *year, unsigned int *month, unsigned int *day)
 {
 DWCalendar *calendar = handle;
 DW_LOCAL_POOL_IN;
+NSCalendar *mycalendar = [[NSCalendar alloc] initWithCalendarIdentifier:NSCalendarIdentifierGregorian];
 NSDate *date = [calendar dateValue];
-NSDateFormatter *df = [[NSDateFormatter alloc] init];
+NSDateComponents* components = [mycalendar components:NSCalendarUnitDay|NSCalendarUnitMonth|NSCalendarUnitYear fromDate:date];
-[df setDateStyle:NSDateFormatterShortStyle];
+*day = [components day];
-NSString *nstr = [df stringFromDate:date];
+*month = [components month];
-sscanf([ nstr UTF8String ], "%d/%d/%d", month, day, year);
+*year = [components year];
-if(*year < 70)
+[mycalendar release];
-{
-*year += 2000;
-}
-else if(*year < 100)
-{
-*year += 1900;
-}
-[df release];
 DW_LOCAL_POOL_OUT;
 }
 /*
 * Causes the embedded HTML widget to take action.

Mercurial > dwindows

comparison mac/dw.m @ 2002:a2931caa3422