Mercurial > dwindows

changeset 660:2784e7ee8bcb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
files mac/dw.m
diffstat 1 files changed, 125 insertions(+), 30 deletions(-) [+]
line wrap: on
line diff
--- a/mac/dw.m	Thu Feb 24 18:59:01 2011 +0000
+++ b/mac/dw.m	Thu Feb 24 22:42:29 2011 +0000
@@ -98,6 +98,24 @@
 					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:
 			{
@@ -144,7 +162,10 @@
 				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:
 			{
@@ -279,8 +300,9 @@
 }
 - (void)windowResized:(NSNotification *)notification;
 {
-        NSSize size = [self frame].size;
-		_do_resize(&box, size.width, size.height);
+	NSSize size = [self frame].size;
+	_do_resize(&box, size.width, size.height);
+	_event_handler([self window], nil, 1);
 }
 -(void)windowDidBecomeMain:(id)sender
 {
@@ -495,6 +517,8 @@
 -(void)setUserdata:(void *)input;
 -(void)drawRect:(NSRect)rect;
 -(BOOL)isFlipped;
+-(void)mouseDown:(NSEvent *)theEvent;
+-(void)mouseUp:(NSEvent *)theEvent;
 @end
 
 @implementation DWRender
@@ -502,6 +526,8 @@
 -(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 */
@@ -694,6 +720,15 @@
 -(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;
@@ -1169,6 +1204,11 @@
 					_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)
@@ -1319,7 +1359,9 @@
 #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;
 }
 
@@ -2673,9 +2715,13 @@
 	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);
@@ -2696,13 +2742,19 @@
 	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];
 }
@@ -2723,7 +2775,7 @@
 	{
 		if([image isMemberOfClass:[NSView class]])
 		{
-			[image lockFocus];
+			[image lockFocusIfCanDraw];
 			NSDictionary *dict = [[NSDictionary alloc] init];
 			[nstr drawAtPoint:NSMakePoint(x, y) withAttributes:dict];
 			[image unlockFocus];
@@ -2731,8 +2783,11 @@
 	}
 	if(pixmap)
 	{
-		image = (id)pixmap;
-		/* TODO: Figure out how to write here */
+		image = (id)pixmap->handle;
+		[image lockFocus];
+		NSDictionary *dict = [[NSDictionary alloc] init];
+		[nstr drawAtPoint:NSMakePoint(x, y) withAttributes:dict];
+		[image unlockFocus];
 	}
 }
 
@@ -2749,7 +2804,7 @@
 	id image = handle;
 	if(pixmap)
 	{
-		image = (id)pixmap;
+		image = (id)pixmap->handle;
 	}
 	NSLog(@"dw_font_text_extents_get() unimplemented\n");
 }
@@ -2770,10 +2825,15 @@
 	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++)
@@ -2785,6 +2845,7 @@
 	{
 		[aPath fill];
 	}
+	[aPath stroke];
 	[image unlockFocus];
 }
 
@@ -2803,9 +2864,13 @@
 	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);
@@ -3503,8 +3568,14 @@
 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];
-	return (HPIXMAP)pixmap;
+	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;
 }
 
 /*
@@ -3519,8 +3590,16 @@
  */
 HPIXMAP API dw_pixmap_new_from_file(HWND handle, char *filename)
 {
-	NSImage *pixmap = [[NSImage alloc] initWithContentsOfFile:[ NSString stringWithUTF8String:filename ]];
-	return (HPIXMAP)pixmap;
+	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;
 }
 
 /*
@@ -3535,9 +3614,17 @@
  */
 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];
-	return (HPIXMAP)pixmap;
+	NSImage *image = [[NSImage alloc] initWithData:thisdata];
+	NSSize size = [image size];
+	pixmap->width = size.width;
+	pixmap->height = size.height;
+	pixmap->handle = image;
+	return pixmap;
 }
 
 /*
@@ -3570,8 +3657,9 @@
  */
 void API dw_pixmap_destroy(HPIXMAP pixmap)
 {
-	NSImage *image = (NSImage *)pixmap;
+	NSImage *image = (NSImage *)pixmap->handle;
 	[image dealloc];
+	free(pixmap);
 }
 
 /*
@@ -3594,12 +3682,16 @@
 	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];
 	}
@@ -5699,7 +5791,10 @@
 {
    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]);
@@ -5819,9 +5914,9 @@
  */
 DWTID dw_thread_new(void *func, void *data, int stack)
 {
-   DWTID thread;
-   void **tmp = malloc(sizeof(void *) * 2);
-   int rc;
+	DWTID thread;
+	void **tmp = malloc(sizeof(void *) * 2);
+	int rc;
 
    tmp[0] = func;
    tmp[1] = data;