dwindows: mac/dw.m comparison

comparison mac/dw.m @ 660:2784e7ee8bcb

Fixes for pixmaps and drawing to the screen. Running into some deadlock issues with multithreaded applications that draw from multiple threads.

author	bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date	Thu, 24 Feb 2011 22:42:29 +0000
parents	756015085da7
children	eee90a788876

comparison

equal deleted inserted replaced

-:756015085da7
+:2784e7ee8bcb
 				if(!timerfunc(handler->data))
 					dw_timer_disconnect(handler->id);
 				return 0;
 			}
+			case 1:
+			{
+				int (*sizefunc)(HWND, int, int, void *) = handler->signalfunction;
+				NSSize size;
+				if([object isMemberOfClass:[NSWindow class]])
+				{
+					NSWindow *window = object;
+					size = [[window contentView] frame].size;
+				}
+				else
+				{
+					NSView *view = object;
+					size = [view frame].size;
+				}
+				return sizefunc(object, size.width, size.height, handler->data);
+			}
 			case 3:
 			case 4:
 			{
 				int (* API buttonfunc)(HWND, int, int, int, void *) = (int (* API)(HWND, int, int, int, void *))handler->signalfunction;
 				int flags = [object pressedMouseButtons];
 				exp.x = rect.origin.x;
 				exp.y = rect.origin.y;
 				exp.width = rect.size.width;
 				exp.height = rect.size.height;
-				return exposefunc(object, &exp, handler->data);
+				int result = exposefunc(object, &exp, handler->data);
+				NSGraphicsContext *gc = [[object window] graphicsContext];
+				[gc flushGraphics];
+				return result;
 			}
 			case 8:
 			{
 				int (* API clickfunc)(HWND, void *) = (int (* API)(HWND, void *))handler->signalfunction;
 [[NSNotificationCenter defaultCenter] removeObserver:self];
 [super dealloc];
 }
 - (void)windowResized:(NSNotification *)notification;
 {
-NSSize size = [self frame].size;
+	NSSize size = [self frame].size;
-		_do_resize(&box, size.width, size.height);
+	_do_resize(&box, size.width, size.height);
+	_event_handler([self window], nil, 1);
 }
 -(void)windowDidBecomeMain:(id)sender
 {
 	if(windowmenu)
 	{
 }
 -(void *)userdata;
 -(void)setUserdata:(void *)input;
 -(void)drawRect:(NSRect)rect;
 -(BOOL)isFlipped;
+-(void)mouseDown:(NSEvent *)theEvent;
+-(void)mouseUp:(NSEvent *)theEvent;
 @end
 @implementation DWRender
 -(void *)userdata { return userdata; }
 -(void)setUserdata:(void *)input { userdata = input; }
 -(void)drawRect:(NSRect)rect { _event_handler(self, nil, 7); }
 -(BOOL)isFlipped { return YES; }
+-(void)mouseDown:(NSEvent *)theEvent { _event_handler(self, theEvent, 3); }
+-(void)mouseUp:(NSEvent *)theEvent { _event_handler(self, theEvent, 4); }
 @end
 /* Subclass for a MLE type */
 @interface DWMLE : NSTextView
 {
 @end
 @implementation DWComboBox
 -(void *)userdata { return userdata; }
 -(void)setUserdata:(void *)input { userdata = input; }
+@end
+/* Subclass for a test object type */
+@interface DWObject : NSObject {}
+-(void)uselessThread:(id)sender;
+@end
+@implementation DWObject
+-(void)uselessThread:(id)sender { /* Thread only to initialize threading */ }
 @end
 typedef struct
 {
 	ULONG message;
 					Box box = [view box];
 					NSSize size = [view frame].size;
 					_do_resize(&box, size.width, size.height);
 				}
 			}
+			else if([handle isMemberOfClass:[DWRender class]])
+			{
+				_event_handler(handle, nil, 1);
+			}
 			if(thisbox->type == DW_HORZ)
 currentx += width + vectorx + (pad * 2);
 if(thisbox->type == DW_VERT)
 currenty += height + vectory + (pad * 2);
 }
 #if !defined(GARBAGE_COLLECT)
 	pool = [[NSAutoreleasePool alloc] init];
 #endif
 	DWMainMenu = _generate_main_menu();
 	[DWApp setMainMenu:DWMainMenu];
+	DWObject *test = [[DWObject alloc] init];
+	NSThread *thread = [[ NSThread alloc] initWithTarget:test selector:@selector(uselessThread:) object:nil];
+	[thread start];
 	return 0;
 }
 /*
 * Runs a message loop for Dynamic Windows.
 void API dw_draw_point(HWND handle, HPIXMAP pixmap, int x, int y)
 {
 	id image = handle;
 	if(pixmap)
 	{
-		image = (id)pixmap;
+		image = (id)pixmap->handle;
-	}
+		[image lockFocus];
-	[image lockFocus];
+	}
+	else
+	{
+		[image lockFocusIfCanDraw];
+	}
 	NSRect rect = NSMakeRect(x, y, x, y);
 	[[NSColor colorWithDeviceRed: DW_RED_VALUE(_foreground)/255.0 green: DW_GREEN_VALUE(_foreground)/255.0 blue: DW_BLUE_VALUE(_foreground)/255.0 alpha: 1] set];
 	NSRectFill(rect);
 	[image unlockFocus];
 }
 void API dw_draw_line(HWND handle, HPIXMAP pixmap, int x1, int y1, int x2, int y2)
 {
 	id image = handle;
 	if(pixmap)
 	{
-		image = (id)pixmap;
+		image = (id)pixmap->handle;
-	}
+		[image lockFocus];
-	[image lockFocus];
+	}
+	else
+	{
+		[image lockFocusIfCanDraw];
+	}
 	NSBezierPath* aPath = [NSBezierPath bezierPath];
+	[aPath setLineWidth: 1.0];
 	[aPath moveToPoint:NSMakePoint(x1, y1)];
 	[aPath lineToPoint:NSMakePoint(x2, y2)];
+	[aPath stroke];
 	[image unlockFocus];
 }
 /* Draw text on a window (preferably a render window).
 	NSString *nstr = [ NSString stringWithUTF8String:text ];
 	if(image)
 	{
 		if([image isMemberOfClass:[NSView class]])
 		{
-			[image lockFocus];
+			[image lockFocusIfCanDraw];
 			NSDictionary *dict = [[NSDictionary alloc] init];
 			[nstr drawAtPoint:NSMakePoint(x, y) withAttributes:dict];
 			[image unlockFocus];
 		}
 	}
 	if(pixmap)
 	{
-		image = (id)pixmap;
+		image = (id)pixmap->handle;
-		/* TODO: Figure out how to write here */
+		[image lockFocus];
+		NSDictionary *dict = [[NSDictionary alloc] init];
+		[nstr drawAtPoint:NSMakePoint(x, y) withAttributes:dict];
+		[image unlockFocus];
 	}
 }
 /* Query the width and height of a text string.
 * Parameters:
 void API dw_font_text_extents_get(HWND handle, HPIXMAP pixmap, char *text, int *width, int *height)
 {
 	id image = handle;
 	if(pixmap)
 	{
-		image = (id)pixmap;
+		image = (id)pixmap->handle;
 	}
 	NSLog(@"dw_font_text_extents_get() unimplemented\n");
 }
 /* Draw a polygon on a window (preferably a render window).
 {
 	id image = handle;
 	int z;
 	if(pixmap)
 	{
-		image = (id)pixmap;
+		image = (id)pixmap->handle;
-	}
+		[image lockFocus];
-	[image lockFocus];
+	}
+	else
+	{
+		[image lockFocusIfCanDraw];
+	}
 	NSBezierPath* aPath = [NSBezierPath bezierPath];
+	[aPath setLineWidth: 1.0];
 	[aPath moveToPoint:NSMakePoint(*x, *y)];
 	for(z=1;z<npoints;z++)
 	{
 		[aPath lineToPoint:NSMakePoint(x[z], y[z])];
 	[aPath closePath];
 	if(fill)
 	{
 		[aPath fill];
 	}
+	[aPath stroke];
 	[image unlockFocus];
 }
 /* Draw a rectangle on a window (preferably a render window).
 * Parameters:
 void API dw_draw_rect(HWND handle, HPIXMAP pixmap, int fill, int x, int y, int width, int height)
 {
 	id image = handle;
 	if(pixmap)
 	{
-		image = (id)pixmap;
+		image = (id)pixmap->handle;
-	}
+		[image lockFocus];
-	[image lockFocus];
+	}
+	else
+	{
+		[image lockFocusIfCanDraw];
+	}
 	NSRect rect = NSMakeRect(x, y, x + width, y + height);
 	[[NSColor colorWithDeviceRed: DW_RED_VALUE(_foreground)/255.0 green: DW_GREEN_VALUE(_foreground)/255.0 blue: DW_BLUE_VALUE(_foreground)/255.0 alpha: 1] set];
 	NSRectFill(rect);
 	[image unlockFocus];
 }
 *       A handle to a pixmap or NULL on failure.
 */
 HPIXMAP API dw_pixmap_new(HWND handle, unsigned long width, unsigned long height, int depth)
 {
 	NSSize size = { (float)width, (float)height };
-	NSImage *pixmap = [[NSImage alloc] initWithSize:size];
+	HPIXMAP pixmap;
-	return (HPIXMAP)pixmap;
+	if (!(pixmap = calloc(1,sizeof(struct _hpixmap))))
+		return NULL;
+	pixmap->width = width;
+	pixmap->height = height;
+	pixmap->handle = [[NSImage alloc] initWithSize:size];
+	return pixmap;
 }
 /*
 * Creates a pixmap from a file.
 * Parameters:
 * Returns:
 *       A handle to a pixmap or NULL on failure.
 */
 HPIXMAP API dw_pixmap_new_from_file(HWND handle, char *filename)
 {
-	NSImage *pixmap = [[NSImage alloc] initWithContentsOfFile:[ NSString stringWithUTF8String:filename ]];
+	HPIXMAP pixmap;
-	return (HPIXMAP)pixmap;
+	if (!(pixmap = calloc(1,sizeof(struct _hpixmap))))
+		return NULL;
+	NSImage *image = [[NSImage alloc] initWithContentsOfFile:[ NSString stringWithUTF8String:filename ]];
+	NSSize size = [image size];
+	pixmap->width = size.width;
+	pixmap->height = size.height;
+	pixmap->handle = image;
+	return pixmap;
 }
 /*
 * Creates a pixmap from memory.
 * Parameters:
 * Returns:
 *       A handle to a pixmap or NULL on failure.
 */
 HPIXMAP API dw_pixmap_new_from_data(HWND handle, char *data, int len)
 {
+	HPIXMAP pixmap;
+	if (!(pixmap = calloc(1,sizeof(struct _hpixmap))))
+		return NULL;
 	NSData *thisdata = [[NSData alloc] dataWithBytes:data length:len];
-	NSImage *pixmap = [[NSImage alloc] initWithData:thisdata];
+	NSImage *image = [[NSImage alloc] initWithData:thisdata];
-	return (HPIXMAP)pixmap;
+	NSSize size = [image size];
+	pixmap->width = size.width;
+	pixmap->height = size.height;
+	pixmap->handle = image;
+	return pixmap;
 }
 /*
 * Creates a bitmap mask for rendering bitmaps with transparent backgrounds
 */
 *       pixmap: Handle to a pixmap returned by
 *               dw_pixmap_new..
 */
 void API dw_pixmap_destroy(HPIXMAP pixmap)
 {
-	NSImage *image = (NSImage *)pixmap;
+	NSImage *image = (NSImage *)pixmap->handle;
 	[image dealloc];
+	free(pixmap);
 }
 /*
 * Copies from one item to another.
 * Parameters:
 {
 	id bltdest = dest;
 	id bltsrc = src;
 	if(destp)
 	{
-		bltdest = (id)destp;
+		bltdest = (id)destp->handle;
-	}
+		[bltdest lockFocus];
-	[bltdest lockFocus];
+	}
+	else
+	{
+		[bltdest lockFocusIfCanDraw];
+	}
 	if(srcp)
 	{
-		bltsrc = (id)srcp;
+		bltsrc = (id)srcp->handle;
 		NSImage *image = bltsrc;
 		[image drawAtPoint:NSMakePoint(xdest, ydest) fromRect:NSMakeRect(xsrc, ysrc, width, height) operation:NSCompositeCopy fraction:1.0];
 	}
 	[bltdest unlockFocus];
 }
 */
 void _dwthreadstart(void *data)
 {
 void (*threadfunc)(void *) = NULL;
 void **tmp = (void **)data;
+#if !defined(GARBAGE_COLLECT)
+	NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+#endif
 threadfunc = (void (*)(void *))tmp[0];
 threadfunc(tmp[1]);
 free(tmp);
 }
 *       data: Parameter(s) passed to the function.
 *       stack: Stack size of new thread (OS/2 and Windows only).
 */
 DWTID dw_thread_new(void *func, void *data, int stack)
 {
-DWTID thread;
+	DWTID thread;
-void **tmp = malloc(sizeof(void *) * 2);
+	void **tmp = malloc(sizeof(void *) * 2);
-int rc;
+	int rc;
 tmp[0] = func;
 tmp[1] = data;
 rc = pthread_create(&thread, NULL, (void *)_dwthreadstart, (void *)tmp);

Mercurial > dwindows

comparison mac/dw.m @ 660:2784e7ee8bcb