dwindows: mac/dw.m comparison

comparison mac/dw.m @ 2994:8311be624877

Mac/iOS: Implement DW_FEATURE_RENDER_SAFE. iOS always operates in safe render mode. Mac defaults to disabled, enabling will enforce expose event restrictions on drawing to render widgets.

author	bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date	Wed, 03 May 2023 23:29:17 +0000
parents	81f9399b11c8
children	a74b30a9d744

comparison

equal deleted inserted replaced

-:392f0b3dd502
+:8311be624877
 pthread_key_t _dw_fg_color_key;
 pthread_key_t _dw_bg_color_key;
 static int DWOSMajor, DWOSMinor, DWOSBuild;
 static char _dw_bundle_path[PATH_MAX+1] = { 0 };
 static char _dw_app_id[_DW_APP_ID_SIZE+1]= {0};
+static int _dw_render_safe_mode = DW_FEATURE_DISABLED;
+static id _dw_render_expose = nil;
+/* Return TRUE if it is safe to draw on the window handle.
+* Either we are in unsafe mode, or we are in an EXPOSE
+* event for the requested render window handle.
+*/
+int _dw_render_safe_check(id handle)
+{
+if(_dw_render_safe_mode == DW_FEATURE_DISABLED ||
+(handle && _dw_render_expose == handle))
+return TRUE;
+return FALSE;
+}
+int _dw_is_render(id handle);
 /* Create a default colors for a thread */
 void _dw_init_colors(void)
 {
 NSColor *fgcolor = [[NSColor grayColor] retain];
 case _DW_EVENT_EXPOSE:
 {
 DWExpose exp;
 int (* API exposefunc)(HWND, DWExpose *, void *) = (int (* API)(HWND, DWExpose *, void *))handler->signalfunction;
 NSRect rect = [object frame];
+id oldrender = _dw_render_expose;
 exp.x = rect.origin.x;
 exp.y = rect.origin.y;
 exp.width = rect.size.width;
 exp.height = rect.size.height;
+/* The render expose is only valid for render class windows */
+if(_dw_is_render(object))
+_dw_render_expose = object;
 int result = exposefunc(object, &exp, handler->data);
+_dw_render_expose = oldrender;
 #ifndef BUILDING_FOR_MOJAVE
 [[object window] flushWindow];
 #endif
 return result;
 }
 #endif
 [super dealloc];
 }
 -(BOOL)acceptsFirstResponder { return YES; }
 @end
+/* So we can check before DWRender is declared */
+int _dw_is_render(id handle)
+{
+if([handle isMemberOfClass:[DWRender class]])
+return TRUE;
+return FALSE;
+}
 @implementation DWObject
 -(void)uselessThread:(id)sender { /* Thread only to initialize threading */ }
 #ifndef BUILDING_FOR_MOJAVE
 -(void)synchronizeThread:(id)param
 if(pixmap)
 bi = (id)pixmap->image;
 else
 {
+if(_dw_render_safe_check(handle))
+{
 #ifdef BUILDING_FOR_MOJAVE
 if([image isMemberOfClass:[DWRender class]])
 {
 DWRender *render = image;
 bi = [render cachedDrawingRep];
 }
 #else
 if((bCanDraw = [image lockFocusIfCanDraw]) == YES)
 _DWLastDrawable = handle;
 #endif
+}
+else
+bCanDraw = NO;
 }
 if(bi)
 {
 [NSGraphicsContext saveGraphicsState];
 [NSGraphicsContext setCurrentContext:_dw_draw_context(bi)];
 if(pixmap)
 bi = (id)pixmap->image;
 else
 {
+if(_dw_render_safe_check(handle))
+{
 #ifdef BUILDING_FOR_MOJAVE
 if([image isMemberOfClass:[DWRender class]])
 {
 DWRender *render = image;
 bi = [render cachedDrawingRep];
 }
 #else
 if((bCanDraw = [image lockFocusIfCanDraw]) == YES)
 _DWLastDrawable = handle;
 #endif
+}
+else
+bCanDraw = NO;
 }
 if(bi)
 {
 [NSGraphicsContext saveGraphicsState];
 [NSGraphicsContext setCurrentContext:_dw_draw_context(bi)];
 font = [render font];
 }
 }
 else if(image && [image isMemberOfClass:[DWRender class]])
 {
-render = image;
+if(_dw_render_safe_check(handle))
-font = [render font];
+{
+render = image;
+font = [render font];
 #ifdef BUILDING_FOR_MOJAVE
 bi = [render cachedDrawingRep];
 #else
 if((bCanDraw = [image lockFocusIfCanDraw]) == YES)
 _DWLastDrawable = handle;
 #endif
+}
+else
+bCanDraw = NO;
 }
 if(bi)
 {
 [NSGraphicsContext saveGraphicsState];
 [NSGraphicsContext setCurrentContext:_dw_draw_context(bi)];
 if(pixmap)
 bi = (id)pixmap->image;
 else
 {
+if(_dw_render_safe_check(handle))
+{
 #ifdef BUILDING_FOR_MOJAVE
 if([image isMemberOfClass:[DWRender class]])
 {
 DWRender *render = image;
 bi = [render cachedDrawingRep];
 }
 #else
 if((bCanDraw = [image lockFocusIfCanDraw]) == YES)
 {
 _DWLastDrawable = handle;
 [[NSGraphicsContext currentContext] setShouldAntialias:(flags & DW_DRAW_NOAA ? NO : YES)];
 }
 #endif
+}
+else
+bCanDraw = NO;
 }
 if(bi)
 {
 id gc = _dw_create_gc(bi, flags & DW_DRAW_NOAA ? NO : YES);
 [NSGraphicsContext saveGraphicsState];
 if(pixmap)
 bi = (id)pixmap->image;
 else
 {
+if(_dw_render_safe_check(handle))
+{
 #ifdef BUILDING_FOR_MOJAVE
 if([image isMemberOfClass:[DWRender class]])
 {
 DWRender *render = image;
 bi = [render cachedDrawingRep];
 }
 #else
 if((bCanDraw = [image lockFocusIfCanDraw]) == YES)
 {
 _DWLastDrawable = handle;
 [[NSGraphicsContext currentContext] setShouldAntialias:(flags & DW_DRAW_NOAA ? NO : YES)];
 }
 #endif
+}
+else
+bCanDraw = NO;
 }
 if(bi)
 {
 id gc = _dw_create_gc(bi, flags & DW_DRAW_NOAA ? NO : YES);
 [NSGraphicsContext saveGraphicsState];
 if(pixmap)
 bi = (id)pixmap->image;
 else
 {
+if(_dw_render_safe_check(handle))
+{
 #ifdef BUILDING_FOR_MOJAVE
 if([image isMemberOfClass:[DWRender class]])
 {
 DWRender *render = image;
 bi = [render cachedDrawingRep];
 }
 #else
 if((bCanDraw = [image lockFocusIfCanDraw]) == YES)
 {
 _DWLastDrawable = handle;
 [[NSGraphicsContext currentContext] setShouldAntialias:(flags & DW_DRAW_NOAA ? NO : YES)];
 }
 #endif
+}
+else
+bCanDraw = NO;
 }
 if(bi)
 {
 id gc = _dw_create_gc(bi, flags & DW_DRAW_NOAA ? NO : YES);
 [NSGraphicsContext saveGraphicsState];
 NSValue* bi;
 DW_LOCAL_POOL_IN;
 /* Sanity checks */
 if((!dest && !destp) || (!src && !srcp) ||
-((srcwidth == -1 || srcheight == -1) && srcwidth != srcheight))
+((srcwidth == -1 || srcheight == -1) && srcwidth != srcheight) ||
+(dest && !_dw_render_safe_check(dest)))
 {
 DW_LOCAL_POOL_OUT;
 return DW_ERROR_GENERAL;
 }
 case DW_FEATURE_MLE_WORD_WRAP:
 case DW_FEATURE_UTF8_UNICODE:
 case DW_FEATURE_TREE:
 case DW_FEATURE_WINDOW_PLACEMENT:
 return DW_FEATURE_ENABLED;
+case DW_FEATURE_RENDER_SAFE:
+return _dw_render_safe_mode;
 #ifdef BUILDING_FOR_MOJAVE
 case DW_FEATURE_DARK_MODE:
 {
 if(@available(macOS 10.14, *))
 {
 case DW_FEATURE_UTF8_UNICODE:
 case DW_FEATURE_TREE:
 case DW_FEATURE_WINDOW_PLACEMENT:
 return DW_ERROR_GENERAL;
 /* These features are supported and configurable */
+case DW_FEATURE_RENDER_SAFE:
+{
+if (state == DW_FEATURE_ENABLED || state == DW_FEATURE_DISABLED)
+{
+_dw_render_safe_mode = state;
+return DW_ERROR_NONE;
+}
+return DW_ERROR_GENERAL;
+}
 #ifdef BUILDING_FOR_MOJAVE
 case DW_FEATURE_DARK_MODE:
 {
 if(@available(macOS 10.14, *))
 {

Mercurial > dwindows

comparison mac/dw.m @ 2994:8311be624877