dwindows: mac/dw.m comparison

comparison mac/dw.m @ 745:d29fb0d5b291

Fixes for font handling on pixmaps... it needs to use the associated render control to get the fonts.

author	bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date	Wed, 16 Mar 2011 07:39:28 +0000
parents	9882b0dfa304
children	a4f99795ff26

comparison

equal deleted inserted replaced

-:9882b0dfa304
+:d29fb0d5b291
 {
 int (*keypressfunc)(HWND, char, int, int, void *) = handler->signalfunction;
 NSString *nchar = [event charactersIgnoringModifiers];
 int special = (int)[event modifierFlags];
 unichar vk = [nchar characterAtIndex:0];
-char ch;
+char ch = '\0';
 /* Handle a valid key */
 if([nchar length] == 1)
 {
 const char *tmp = [nchar UTF8String];
 	{
 		bgcolor = nil;
 	}
 	else
 	{
-NSLog(@"R: %d G: %d B: %d", (int)DW_RED_VALUE(input), (int)DW_GREEN_VALUE(input), (int)DW_BLUE_VALUE(input));
 		bgcolor = [NSColor colorWithDeviceRed: DW_RED_VALUE(input)/255.0 green: DW_GREEN_VALUE(input)/255.0 blue: DW_BLUE_VALUE(input)/255.0 alpha: 1];
 	}
 }
 @end
 newpos = max;
 }
 break;
 default:
-; // do nothing
+; /* do nothing */
 }
 if(newpos != result)
 {
 double newposd = (double)newpos/max;
 [self setDoubleValue:newposd];
 /* Subclass for a render area type */
 @interface DWRender : NSView
 {
 	void *userdata;
+NSFont *font;
 }
 -(void *)userdata;
 -(void)setUserdata:(void *)input;
+-(void)setFont:(NSFont *)input;
+-(NSFont *)font;
 -(void)mouseDown:(NSEvent *)theEvent;
 -(void)mouseUp:(NSEvent *)theEvent;
 -(NSMenu *)menuForEvent:(NSEvent *)theEvent;
 -(void)rightMouseUp:(NSEvent *)theEvent;
 -(void)otherMouseDown:(NSEvent *)theEvent;
 @end
 @implementation DWRender
 -(void *)userdata { return userdata; }
 -(void)setUserdata:(void *)input { userdata = input; }
+-(void)setFont:(NSFont *)input { [font release]; font = input; [font retain]; }
+-(NSFont *)font { return font; }
 -(void)mouseDown:(NSEvent *)theEvent { _event_handler(self, (void *)1, 3); }
 -(void)mouseUp:(NSEvent *)theEvent { _event_handler(self, (void *)1, 4); }
 -(NSMenu *)menuForEvent:(NSEvent *)theEvent { _event_handler(self, (void *)2, 3); return nil; }
 -(void)rightMouseUp:(NSEvent *)theEvent { _event_handler(self, (void *)2, 4); }
 -(void)otherMouseDown:(NSEvent *)theEvent { _event_handler(self, (void *)3, 3); }
 -(void)otherMouseUp:(NSEvent *)theEvent { _event_handler(self, (void *)3, 4); }
 -(void)drawRect:(NSRect)rect { _event_handler(self, nil, 7); }
 -(void)keyDown:(NSEvent *)theEvent { _event_handler(self, theEvent, 2); _event_handler([self window], theEvent, 2); }
 -(BOOL)isFlipped { return NO; }
--(void)dealloc { UserData *root = userdata; _remove_userdata(&root, NULL, TRUE); [super dealloc]; }
+-(void)dealloc { UserData *root = userdata; _remove_userdata(&root, NULL, TRUE); [font release]; [super dealloc]; }
 @end
 /* Subclass for a MLE type */
 @interface DWMLE : NSTextView
 {
 NSString *respath = [bundle resourcePath];
 NSString *filepath = [respath stringByAppendingFormat:@"/%u.png", resid];
 	NSImage *image = [[NSImage alloc] initWithContentsOfFile:filepath];
 	DWButton *button = _button_new("", resid);
 	[button setImage:image];
-//[button setBezelStyle:0];
 [button setButtonType:NSMomentaryLight];
 [button setBordered:NO];
 [image release];
 	return button;
 }
 HWND API dw_mle_new(ULONG cid)
 {
 	DWMLE *mle = [[DWMLE alloc] init];
 NSScrollView *scrollview  = [[NSScrollView alloc] init];
-//[mle setScrollview:scrollview];
 [scrollview setBorderType:NSBezelBorder];
 [scrollview setHasVerticalScroller:YES];
 [scrollview setAutohidesScrollers:YES];
 [scrollview setAutoresizingMask:NSViewWidthSizable|NSViewHeightSizable];
 [scrollview setDocumentView:mle];
 int _locked_by_me = FALSE;
 DW_MUTEX_LOCK;
 	id image = handle;
 	if(pixmap)
 	{
-		image = (id)pixmap->handle;
+		image = (id)pixmap->image;
 		[image lockFocus];
 	}
 	else
 	{
 		[image lockFocusIfCanDraw];
 int _locked_by_me = FALSE;
 DW_MUTEX_LOCK;
 	id image = handle;
 	if(pixmap)
 	{
-		image = (id)pixmap->handle;
+		image = (id)pixmap->image;
 		[image lockFocus];
 	}
 	else
 	{
 		[image lockFocusIfCanDraw];
 */
 void API dw_draw_text(HWND handle, HPIXMAP pixmap, int x, int y, char *text)
 {
 int _locked_by_me = FALSE;
 DW_MUTEX_LOCK;
-	id image = handle;
+id image = handle;
-	NSString *nstr = [ NSString stringWithUTF8String:text ];
+NSString *nstr = [ NSString stringWithUTF8String:text ];
-	if(image)
+if(image)
-	{
+{
-		if([image isMemberOfClass:[NSView class]])
+if([image isMemberOfClass:[DWRender class]])
-		{
+{
-			[image lockFocusIfCanDraw];
+DWRender *render = handle;
+NSFont *font = [render font];
+[image lockFocusIfCanDraw];
 NSColor *color = [NSColor colorWithDeviceRed: DW_RED_VALUE(_foreground)/255.0 green: DW_GREEN_VALUE(_foreground)/255.0 blue: DW_BLUE_VALUE(_foreground)/255.0 alpha: 1];
-NSDictionary *dict = [[NSDictionary alloc] initWithObjectsAndKeys:
+NSMutableDictionary *dict = [[NSMutableDictionary alloc] initWithObjectsAndKeys:color, NSForegroundColorAttributeName, nil];
-/*[NSFont fontWithName:@"Helvetica" size:26], NSFontAttributeName,*/
+if(font)
-color, NSForegroundColorAttributeName, nil];
+{
-			[nstr drawAtPoint:NSMakePoint(x, y) withAttributes:dict];
+[dict setValue:font forKey:NSFontAttributeName];
-[dict release];
+}
-			[image unlockFocus];
+[nstr drawAtPoint:NSMakePoint(x, y) withAttributes:dict];
-		}
+[image unlockFocus];
-		_DWLastDrawable = handle;
+}
-	}
+_DWLastDrawable = handle;
-	if(pixmap)
+}
-	{
+if(pixmap)
-		image = (id)pixmap->handle;
+{
-		[image lockFocus];
+NSFont *font = nil;
-		NSColor *color = [NSColor colorWithDeviceRed: DW_RED_VALUE(_foreground)/255.0 green: DW_GREEN_VALUE(_foreground)/255.0 blue: DW_BLUE_VALUE(_foreground)/255.0 alpha: 1];
+DWRender *render = pixmap->handle;
-NSDictionary *dict = [[NSDictionary alloc] initWithObjectsAndKeys:
+if([render isMemberOfClass:[DWRender class]])
-/*[NSFont fontWithName:@"Helvetica" size:26], NSFontAttributeName,*/
+{
-color, NSForegroundColorAttributeName, nil];
+font = [render font];
-		[nstr drawAtPoint:NSMakePoint(x, y) withAttributes:dict];
+}
-[dict release];
+image = (id)pixmap->image;
-		[image unlockFocus];
+[image lockFocus];
-	}
+NSColor *color = [NSColor colorWithDeviceRed: DW_RED_VALUE(_foreground)/255.0 green: DW_GREEN_VALUE(_foreground)/255.0 blue: DW_BLUE_VALUE(_foreground)/255.0 alpha: 1];
+NSMutableDictionary *dict = [[NSMutableDictionary alloc] initWithObjectsAndKeys:color, NSForegroundColorAttributeName, nil];
+if(font)
+{
+[dict setValue:font forKey:NSFontAttributeName];
+}
+[nstr drawAtPoint:NSMakePoint(x, y) withAttributes:dict];
+[image unlockFocus];
+}
 DW_MUTEX_UNLOCK;
 }
 /* Query the width and height of a text string.
 * Parameters:
 *       width: Pointer to a variable to be filled in with the width.
 *       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)
 {
-int _locked_by_me = FALSE;
+id image = handle;
-DW_MUTEX_LOCK;
+id object = handle;
-	id image = handle;
+NSString *nstr = [NSString stringWithUTF8String:text];
-	NSString *nstr = [NSString stringWithUTF8String:text];
+if(pixmap)
-	if(pixmap)
+{
-	{
+image = (id)pixmap->image;
-		image = (id)pixmap->handle;
+object = pixmap->handle;
-		[image lockFocus];
+}
-	}
+NSMutableDictionary *dict = [[NSMutableDictionary alloc] init];
-	else
+if([object isMemberOfClass:[DWRender class]])
-	{
+{
-		[image lockFocusIfCanDraw];
+NSFont *font = [object font];
-	}
-	NSDictionary *dict = [[NSDictionary alloc] init];
+if(font)
-	NSSize size = [nstr sizeWithAttributes:dict];
+{
+[dict setValue:font forKey:NSFontAttributeName];
+}
+}
+NSSize size = [nstr sizeWithAttributes:dict];
 [dict release];
-	if(width)
+if(width)
-	{
+{
-		*width = size.width;
+*width = size.width;
-	}
+}
-	if(height)
+if(height)
-	{
+{
-		*height = size.height;
+*height = size.height;
-	}
+}
-	[image unlockFocus];
-DW_MUTEX_UNLOCK;
 }
 /* Draw a polygon on a window (preferably a render window).
 * Parameters:
 *       handle: Handle to the window.
 DW_MUTEX_LOCK;
 	id image = handle;
 	int z;
 	if(pixmap)
 	{
-		image = (id)pixmap->handle;
+		image = (id)pixmap->image;
 		[image lockFocus];
 	}
 	else
 	{
 		[image lockFocusIfCanDraw];
 int _locked_by_me = FALSE;
 DW_MUTEX_LOCK;
 	id image = handle;
 	if(pixmap)
 	{
-		image = (id)pixmap->handle;
+		image = (id)pixmap->image;
 		[image lockFocus];
 	}
 	else
 	{
 		[image lockFocusIfCanDraw];
 * Returns:
 *       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 };
+NSSize size = { (float)width, (float)height };
-	HPIXMAP pixmap;
+HPIXMAP pixmap;
-	if (!(pixmap = calloc(1,sizeof(struct _hpixmap))))
+if(!(pixmap = calloc(1,sizeof(struct _hpixmap))))
-		return NULL;
+return NULL;
-	pixmap->width = width;
+pixmap->width = width;
-	pixmap->height = height;
+pixmap->height = height;
-	NSImage *image = pixmap->handle = [[NSImage alloc] initWithSize:size];
+pixmap->handle = handle;
+NSImage *image = pixmap->image = [[NSImage alloc] initWithSize:size];
 [image setFlipped:YES];
-	return pixmap;
+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)
 {
-	HPIXMAP pixmap;
+HPIXMAP pixmap;
-	if (!(pixmap = calloc(1,sizeof(struct _hpixmap))))
+if(!(pixmap = calloc(1,sizeof(struct _hpixmap))))
-		return NULL;
+return NULL;
 NSString *nstr = [ NSString stringWithUTF8String:filename ];
 NSImage *image = [[NSImage alloc] initWithContentsOfFile:nstr];
 if(!image)
 {
 nstr = [nstr stringByAppendingString:@".png"];
 image = [[NSImage alloc] initWithContentsOfFile:nstr];
 }
-	NSSize size = [image size];
+NSSize size = [image size];
-	pixmap->width = size.width;
+pixmap->width = size.width;
-	pixmap->height = size.height;
+pixmap->height = size.height;
-	pixmap->handle = image;
+pixmap->image = image;
-	return pixmap;
+pixmap->handle = handle;
+[image setFlipped:YES];
+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;
+HPIXMAP pixmap;
-	if (!(pixmap = calloc(1,sizeof(struct _hpixmap))))
+if(!(pixmap = calloc(1,sizeof(struct _hpixmap))))
-		return NULL;
+return NULL;
-	NSData *thisdata = [[NSData alloc] dataWithBytes:data length:len];
+NSData *thisdata = [[NSData alloc] dataWithBytes:data length:len];
-	NSImage *image = [[NSImage alloc] initWithData:thisdata];
+NSImage *image = [[NSImage alloc] initWithData:thisdata];
-	NSSize size = [image size];
+NSSize size = [image size];
-	pixmap->width = size.width;
+pixmap->width = size.width;
-	pixmap->height = size.height;
+pixmap->height = size.height;
-	pixmap->handle = image;
+pixmap->image = image;
-	return pixmap;
+pixmap->handle = handle;
+[image setFlipped:YES];
+return pixmap;
 }
 /*
 * Creates a bitmap mask for rendering bitmaps with transparent backgrounds
 */
 * Returns:
 *       A handle to a pixmap or NULL on failure.
 */
 HPIXMAP API dw_pixmap_grab(HWND handle, ULONG resid)
 {
-	HPIXMAP pixmap;
+HPIXMAP pixmap;
-	if (!(pixmap = calloc(1,sizeof(struct _hpixmap))))
+if(!(pixmap = calloc(1,sizeof(struct _hpixmap))))
-		return NULL;
+return NULL;
 NSBundle *bundle = [NSBundle mainBundle];
 NSString *respath = [bundle resourcePath];
 NSString *filepath = [respath stringByAppendingFormat:@"/%u.png", resid];
-	NSImage *image = [[NSImage alloc] initWithContentsOfFile:filepath];
+NSImage *image = [[NSImage alloc] initWithContentsOfFile:filepath];
-	NSSize size = [image size];
+NSSize size = [image size];
-	pixmap->width = size.width;
+pixmap->width = size.width;
-	pixmap->height = size.height;
+pixmap->height = size.height;
-	pixmap->handle = image;
+pixmap->image = image;
-[image release];
+pixmap->handle = handle;
-	return pixmap;
+[image setFlipped:YES];
+return pixmap;
 }
 /*
 * Destroys an allocated pixmap.
 * Parameters:
 *       pixmap: Handle to a pixmap returned by
 *               dw_pixmap_new..
 */
 void API dw_pixmap_destroy(HPIXMAP pixmap)
 {
-	NSImage *image = (NSImage *)pixmap->handle;
+	NSImage *image = (NSImage *)pixmap->image;
 	[image dealloc];
 	free(pixmap);
 }
 /*
 bltinfo->xsrc = xsrc;
 bltinfo->ysrc = ysrc;
 if(destp)
 {
-bltinfo->dest = (id)destp->handle;
+bltinfo->dest = (id)destp->image;
 }
 if(srcp)
 {
-id object = bltinfo->src = (id)srcp->handle;
+id object = bltinfo->src = (id)srcp->image;
 [object retain];
 }
 [DWObj performSelectorOnMainThread:@selector(doBitBlt:) withObject:bi waitUntilDone:YES];
 }
 if([object isKindOfClass:[NSControl class]])
 {
 [object setFont:font];
 [[object cell] setFont:font];
 }
+else if([object isMemberOfClass:[DWRender class]])
+{
+DWRender *render = object;
+[render setFont:font];
+}
 }
 return 0;
 }
 /*
 */
 char * API dw_window_get_font(HWND handle)
 {
 id object = handle;
-if([object isKindOfClass:[NSControl class]])
+if([object isKindOfClass:[NSControl class]] || [object isMemberOfClass:[DWRender class]])
 {
-NSControl *control = object;
+NSFont *font = [object font];
-NSFont *font = [control font];
 NSString *fontname = [font fontName];
 NSString *output = [NSString stringWithFormat:@"%d.%s", (int)[font pointSize], [fontname UTF8String]];
 return strdup([output UTF8String]);
 }
 return NULL;
 {
 	NSObject *object = handle;
 	if([ object isKindOfClass:[ NSImageView class ] ])
 	{
 		NSImageView *iv = handle;
-NSImage *bitmap = NULL;
+NSImage *bitmap = nil;
 if(filename)
 {
 bitmap = [[NSImage alloc] initWithContentsOfFile:[ NSString stringWithUTF8String:filename ]];
 }
 threadfunc(tmp[1]);
 /* Release the pool when we are done so we don't leak */
 #if !defined(GARBAGE_COLLECT)
 pool = pthread_getspecific(_dw_pool_key);
-	[pool release];
+	[pool drain];
 #endif
 free(tmp);
 }
 void _dw_default_font(char *fontname)

Mercurial > dwindows

comparison mac/dw.m @ 745:d29fb0d5b291