dwindows: mac/dw.m comparison

comparison mac/dw.m @ 1580:a51397ea24bf

Added local auto-release macros on Mac to allow us to prevent leaks on secondary threads without calling _dw_pool_drain(). Macros should be added to any funtions that allocate temporary objects.

author	bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date	Wed, 25 Jan 2012 03:17:36 +0000
parents	ae5e322584cd
children	728778634933

comparison

equal deleted inserted replaced

-:245e6bf51317
+:a51397ea24bf
 dw_mutex_unlock(DWRunMutex); \
 dw_mutex_unlock(DWThreadMutex2); \
 _dw_mutex_locked = (pthread_t)-1; \
 dw_mutex_unlock(DWThreadMutex); \
 _locked_by_me = FALSE; } }
+/* Macros to handle local auto-release pools */
+#define DW_LOCAL_POOL_IN NSAutoreleasePool *localpool = nil; \
+if(DWThread != (DWTID)-1 && pthread_self() != DWThread) \
+localpool = [[NSAutoreleasePool alloc] init];
+#define DW_LOCAL_POOL_OUT if(localpool) [localpool drain];
 unsigned long _colors[] =
 {
 0x00000000,   /* 0  black */
 0x000000bb,   /* 1  red */
 */
 char * API dw_file_browse(char *title, char *defpath, char *ext, int flags)
 {
 char temp[PATH_MAX+1];
 char *file = NULL, *path = NULL;
+DW_LOCAL_POOL_IN;
 /* Figure out path information...
 * These functions are only support in Snow Leopard and later...
 */
 if(defpath && DWOSMinor > 5)
 * files and directories selected.
 */
 NSArray *files = [openDlg URLs];
 NSString *fileName = [[files objectAtIndex:0] path];
 if(fileName)
-return strdup([ fileName UTF8String ]);
+{
+char *ret = strdup([ fileName UTF8String ]);
+DW_LOCAL_POOL_OUT;
+return ret;
+}
 }
 }
 else
 {
 /* Create the File Save Dialog class. */
 /* Get an array containing the full filenames of all
 * files and directories selected.
 */
 NSString* fileName = [[saveDlg URL] path];
 if(fileName)
-return strdup([ fileName UTF8String ]);
+{
-}
+char *ret = strdup([ fileName UTF8String ]);
-}
+DW_LOCAL_POOL_OUT;
+return ret;
+}
+}
+}
+DW_LOCAL_POOL_OUT;
 return NULL;
 }
 /*
 * Gets the contents of the default clipboard as text.
 */
 void API dw_color_foreground_set(unsigned long value)
 {
 NSColor *oldcolor = pthread_getspecific(_dw_fg_color_key);
 NSColor *newcolor;
+DW_LOCAL_POOL_IN;
 _foreground = _get_color(value);
 newcolor = [[NSColor colorWithDeviceRed:    DW_RED_VALUE(_foreground)/255.0 green:
 DW_GREEN_VALUE(_foreground)/255.0 blue:
 DW_BLUE_VALUE(_foreground)/255.0 alpha: 1] retain];
 pthread_setspecific(_dw_fg_color_key, newcolor);
 [oldcolor release];
+DW_LOCAL_POOL_OUT;
 }
 /* Sets the current background drawing color.
 * Parameters:
 *       red: red value.
 */
 void API dw_color_background_set(unsigned long value)
 {
 NSColor *oldcolor = pthread_getspecific(_dw_bg_color_key);
 NSColor *newcolor;
+DW_LOCAL_POOL_IN;
 if(value == DW_CLR_DEFAULT)
 {
 pthread_setspecific(_dw_bg_color_key, NULL);
 }
 DW_GREEN_VALUE(_background)/255.0 blue:
 DW_BLUE_VALUE(_background)/255.0 alpha: 1] retain];
 pthread_setspecific(_dw_bg_color_key, newcolor);
 }
 [oldcolor release];
+DW_LOCAL_POOL_OUT;
 }
 /* Allows the user to choose a color using the system's color chooser dialog.
 * Parameters:
 *       value: current color
 *       y: Y coordinate.
 */
 void API dw_draw_point(HWND handle, HPIXMAP pixmap, int x, int y)
 {
 int _locked_by_me = FALSE;
+DW_LOCAL_POOL_IN;
 DW_MUTEX_LOCK;
 id image = handle;
 if(pixmap)
 {
 image = (id)pixmap->image;
 else
 {
 if([image lockFocusIfCanDraw] == NO)
 {
 DW_MUTEX_UNLOCK;
+DW_LOCAL_POOL_OUT;
 return;
 }
 _DWLastDrawable = handle;
 }
 NSBezierPath* aPath = [NSBezierPath bezierPath];
 else
 {
 [image unlockFocus];
 }
 DW_MUTEX_UNLOCK;
+DW_LOCAL_POOL_OUT;
 }
 /* Draw a line on a window (preferably a render window).
 * Parameters:
 *       handle: Handle to the window.
 *       y2: Second Y coordinate.
 */
 void API dw_draw_line(HWND handle, HPIXMAP pixmap, int x1, int y1, int x2, int y2)
 {
 int _locked_by_me = FALSE;
+DW_LOCAL_POOL_IN;
 DW_MUTEX_LOCK;
 id image = handle;
 if(pixmap)
 {
 image = (id)pixmap->image;
 else
 {
 if([image lockFocusIfCanDraw] == NO)
 {
 DW_MUTEX_UNLOCK;
+DW_LOCAL_POOL_OUT;
 return;
 }
 _DWLastDrawable = handle;
 }
 NSBezierPath* aPath = [NSBezierPath bezierPath];
 else
 {
 [image unlockFocus];
 }
 DW_MUTEX_UNLOCK;
+DW_LOCAL_POOL_OUT;
 }
 /* Draw text on a window (preferably a render window).
 * Parameters:
 *       handle: Handle to the window.
 *       text: Text to be displayed.
 */
 void API dw_draw_text(HWND handle, HPIXMAP pixmap, int x, int y, char *text)
 {
 int _locked_by_me = FALSE;
+DW_LOCAL_POOL_IN;
 DW_MUTEX_LOCK;
 id image = handle;
 NSString *nstr = [ NSString stringWithUTF8String:text ];
 if(image)
 {
 DWRender *render = handle;
 NSFont *font = [render font];
 if([image lockFocusIfCanDraw] == NO)
 {
 DW_MUTEX_UNLOCK;
+DW_LOCAL_POOL_OUT;
 return;
 }
 NSColor *fgcolor = pthread_getspecific(_dw_fg_color_key);
 NSColor *bgcolor = pthread_getspecific(_dw_bg_color_key);
 NSMutableDictionary *dict = [[NSMutableDictionary alloc] initWithObjectsAndKeys:fgcolor, NSForegroundColorAttributeName, nil];
 [nstr drawAtPoint:NSMakePoint(x, y) withAttributes:dict];
 [NSGraphicsContext restoreGraphicsState];
 [dict release];
 }
 DW_MUTEX_UNLOCK;
+DW_LOCAL_POOL_OUT;
 }
 /* Query the width and height of a text string.
 * Parameters:
 *       handle: Handle to the window.
 *       height Pointer to a variable to be filled in with the height.
 */
 void API dw_font_text_extents_get(HWND handle, HPIXMAP pixmap, char *text, int *width, int *height)
 {
 id object = handle;
-NSString *nstr = [NSString stringWithUTF8String:text];
+NSString *nstr;
 NSFont *font = nil;
+DW_LOCAL_POOL_IN;
+nstr = [NSString stringWithUTF8String:text];
 /* Check the pixmap for associated object or font */
 if(pixmap)
 {
 object = pixmap->handle;
 font = pixmap->font;
 }
 if(height)
 {
 *height = size.height;
 }
+DW_LOCAL_POOL_OUT;
 }
 /* Internal function to create an image graphics context...
 * with or without antialiasing enabled.
 */
 *       height: Height of rectangle.
 */
 void API dw_draw_polygon( HWND handle, HPIXMAP pixmap, int flags, int npoints, int *x, int *y )
 {
 int _locked_by_me = FALSE;
+DW_LOCAL_POOL_IN;
 DW_MUTEX_LOCK;
 id image = handle;
 int z;
 if(pixmap)
 {
 else
 {
 if([image lockFocusIfCanDraw] == NO)
 {
 DW_MUTEX_UNLOCK;
+DW_LOCAL_POOL_OUT;
 return;
 }
 [[NSGraphicsContext currentContext] setShouldAntialias:(flags & DW_DRAW_NOAA ? NO : YES)];
 _DWLastDrawable = handle;
 }
 else
 {
 [image unlockFocus];
 }
 DW_MUTEX_UNLOCK;
+DW_LOCAL_POOL_OUT;
 }
 /* Draw a rectangle on a window (preferably a render window).
 * Parameters:
 *       handle: Handle to the window.
 *       height: Height of rectangle.
 */
 void API dw_draw_rect(HWND handle, HPIXMAP pixmap, int flags, int x, int y, int width, int height)
 {
 int _locked_by_me = FALSE;
+DW_LOCAL_POOL_IN;
 DW_MUTEX_LOCK;
 id image = handle;
 if(pixmap)
 {
 image = (id)pixmap->image;
 else
 {
 if([image lockFocusIfCanDraw] == NO)
 {
 DW_MUTEX_UNLOCK;
+DW_LOCAL_POOL_OUT;
 return;
 }
 [[NSGraphicsContext currentContext] setShouldAntialias:(flags & DW_DRAW_NOAA ? NO : YES)];
 _DWLastDrawable = handle;
 }
 else
 {
 [image unlockFocus];
 }
 DW_MUTEX_UNLOCK;
+DW_LOCAL_POOL_OUT;
 }
 /* Draw an arc on a window (preferably a render window).
 * Parameters:
 *       handle: Handle to the window.
 *       y2: Y coordinate of second segment of arc.
 */
 void API dw_draw_arc(HWND handle, HPIXMAP pixmap, int flags, int xorigin, int yorigin, int x1, int y1, int x2, int y2)
 {
 int _locked_by_me = FALSE;
+DW_LOCAL_POOL_IN;
 DW_MUTEX_LOCK;
 id image = handle;
 double r, a1, a2, a;
 if(pixmap)
 else
 {
 if([image lockFocusIfCanDraw] == NO)
 {
 DW_MUTEX_UNLOCK;
+DW_LOCAL_POOL_OUT;
 return;
 }
 [[NSGraphicsContext currentContext] setShouldAntialias:(flags & DW_DRAW_NOAA ? NO : YES)];
 _DWLastDrawable = handle;
 }
 else
 {
 [image unlockFocus];
 }
 DW_MUTEX_UNLOCK;
+DW_LOCAL_POOL_OUT;
 }
 /*
 * Create a tree object to be packed.
 * Parameters:
 *       A handle to a pixmap or NULL on failure.
 */
 HPIXMAP API dw_pixmap_new_from_file(HWND handle, char *filename)
 {
 HPIXMAP pixmap;
+DW_LOCAL_POOL_IN;
 char *ext = _dw_get_image_extension( filename );
 if(!(pixmap = calloc(1,sizeof(struct _hpixmap))))
+{
+DW_LOCAL_POOL_OUT;
 return NULL;
+}
 NSString *nstr = [ NSString stringWithUTF8String:filename ];
 NSImage *tmpimage = [[[NSImage alloc] initWithContentsOfFile:nstr] autorelease];
 if(!tmpimage && ext)
 {
 nstr = [nstr stringByAppendingString: [NSString stringWithUTF8String:ext]];
 tmpimage = [[[NSImage alloc] initWithContentsOfFile:nstr] autorelease];
 }
 if(!tmpimage)
+{
+DW_LOCAL_POOL_OUT;
 return NULL;
+}
 NSSize size = [tmpimage size];
 NSBitmapImageRep *image = [[NSBitmapImageRep alloc]
 initWithBitmapDataPlanes:NULL
 pixelsWide:size.width
 pixelsHigh:size.height
 _flip_image(tmpimage, image, size);
 pixmap->width = size.width;
 pixmap->height = size.height;
 pixmap->image = image;
 pixmap->handle = handle;
+DW_LOCAL_POOL_OUT;
 return pixmap;
 }
 /*
 * Creates a pixmap from memory.
 *       A handle to a pixmap or NULL on failure.
 */
 HPIXMAP API dw_pixmap_new_from_data(HWND handle, char *data, int len)
 {
 HPIXMAP pixmap;
+DW_LOCAL_POOL_IN;
 if(!(pixmap = calloc(1,sizeof(struct _hpixmap))))
+{
+DW_LOCAL_POOL_OUT;
 return NULL;
+}
 NSData *thisdata = [NSData dataWithBytes:data length:len];
 NSImage *tmpimage = [[[NSImage alloc] initWithData:thisdata] autorelease];
 if(!tmpimage)
+{
+DW_LOCAL_POOL_OUT;
 return NULL;
+}
 NSSize size = [tmpimage size];
 NSBitmapImageRep *image = [[NSBitmapImageRep alloc]
 initWithBitmapDataPlanes:NULL
 pixelsWide:size.width
 pixelsHigh:size.height
 _flip_image(tmpimage, image, size);
 pixmap->width = size.width;
 pixmap->height = size.height;
 pixmap->image = image;
 pixmap->handle = handle;
+DW_LOCAL_POOL_OUT;
 return pixmap;
 }
 /*
 * Sets the transparent color for a pixmap
 *       A handle to a pixmap or NULL on failure.
 */
 HPIXMAP API dw_pixmap_grab(HWND handle, ULONG resid)
 {
 HPIXMAP pixmap;
+DW_LOCAL_POOL_IN;
 if(!(pixmap = calloc(1,sizeof(struct _hpixmap))))
+{
+DW_LOCAL_POOL_OUT;
 return NULL;
+}
 NSBundle *bundle = [NSBundle mainBundle];
 NSString *respath = [bundle resourcePath];
 NSString *filepath = [respath stringByAppendingFormat:@"/%u.png", resid];
 NSImage *temp = [[NSImage alloc] initWithContentsOfFile:filepath];
 pixmap->handle = handle;
 [temp release];
 return pixmap;
 }
 free(pixmap);
+DW_LOCAL_POOL_OUT;
 return NULL;
 }
 /*
 * Sets the font used by a specified pixmap.
 *       DW_ERROR_NONE on success and DW_ERROR_GENERAL on failure.
 */
 int API dw_pixmap_stretch_bitblt(HWND dest, HPIXMAP destp, int xdest, int ydest, int width, int height, HWND src, HPIXMAP srcp, int xsrc, int ysrc, int srcwidth, int srcheight)
 {
 DWBitBlt *bltinfo = calloc(1, sizeof(DWBitBlt));
-NSValue* bi = [NSValue valueWithPointer:bltinfo];
+NSValue* bi;
+DW_LOCAL_POOL_IN;
+bi = [NSValue valueWithPointer:bltinfo];
 /* Sanity checks */
 if((!dest && !destp) || (!src && !srcp) ||
 ((srcwidth == -1 || srcheight == -1) && srcwidth != srcheight))
+{
+DW_LOCAL_POOL_OUT;
 return DW_ERROR_GENERAL;
+}
 /* Fill in the information */
 bltinfo->dest = dest;
 bltinfo->src = src;
 bltinfo->xdest = xdest;
 if(srcp)
 {
 id object = bltinfo->src = (id)srcp->image;
 [object retain];
 }
-[DWObj performSelectorOnMainThread:@selector(doBitBlt:) withObject:bi waitUntilDone:YES];
+if(DWThread == (DWTID)-1)
+[DWObj doBitBlt:bi];
+else
+[DWObj performSelectorOnMainThread:@selector(doBitBlt:) withObject:bi waitUntilDone:YES];
+DW_LOCAL_POOL_OUT;
 return DW_ERROR_NONE;
 }
 /*
 * Create a new static text window (widget) to be packed.
 *       data: Pointer to the data to be passed to the function.
 */
 void API dw_window_function(HWND handle, void *function, void *data)
 {
 void **params = calloc(2, sizeof(void *));
-NSValue *v = [NSValue valueWithPointer:params];
+NSValue *v;
+DW_LOCAL_POOL_IN;
+v = [NSValue valueWithPointer:params];
 params[0] = function;
 params[1] = data;
 [DWObj performSelectorOnMainThread:@selector(doWindowFunc:) withObject:v waitUntilDone:YES];
 free(params);
+DW_LOCAL_POOL_OUT;
 }
 /*
 * Changes the appearance of the mouse pointer.
 *                 NULL if you use the id param)
 */
 void API dw_window_set_bitmap(HWND handle, unsigned long resid, char *filename)
 {
 NSObject *object = handle;
+DW_LOCAL_POOL_IN;
 if([ object isKindOfClass:[ NSImageView class ] ])
 {
 NSImageView *iv = handle;
 NSImage *bitmap = nil;
 [iv setImage:bitmap];
 /* Queue a redraw on the top-level window */
 _dw_redraw([iv window], TRUE);
 }
 }
+DW_LOCAL_POOL_OUT;
 }
 /*
 * Sets the icon used for a given window.
 * Parameters:

Mercurial > dwindows

comparison mac/dw.m @ 1580:a51397ea24bf