The R Project SVN – R-packages – Diff – /trunk/Mac-GUI/Quartz/QuartzDevice.m

     dd->deviceSpecific = (void *) xd;
     dd->displayListOn = TRUE;
 	xd->DevView = [xd->QuartzDoc getDeviceView];
 	xd->DevWindow = [xd->QuartzDoc getDeviceWindow];
-	xd->DevTextStorage = [xd->DevView getDevTextStorage];
-	xd->DevLayoutManager = [xd->DevView getDevLayoutManager];
-	xd->DevTextContainer = [xd->DevView getDevTextContainer];
-	[xd->DevTextContainer setLineFragmentPadding:0.0];
 	[xd->DevView setDevNum: xd->DevNum];
 	[xd->DevView setPDFDrawing: FALSE];
 	xd->topLeftPoint = NSMakePoint(0, 0);
     return 1;
 static double 	RQuartz_StrWidth(char *str,
 				R_GE_gcontext *gc,
 				NewDevDesc *dd)
+{
+	NSString *text;
+	if(gc->fontface==5  || strcmp(gc->fontfamily,"symbol")==0)
+	    text = [[NSString alloc] initWithBytes:str length:strlen(str) encoding:NSSymbolStringEncoding];
+	else
-	QuartzDesc *xd = (QuartzDesc*)dd->deviceSpecific;
+		text = [[NSString stringWithUTF8String:str] retain];
+	if (!text) return 0.0;
 	NSDictionary* attr = [NSDictionary dictionaryWithObjectsAndKeys:
 		RQuartz_Font(gc, dd), NSFontAttributeName,
 		NULL];
-	NSAttributedString *attrStr;
-	if(gc->fontface==5  || strcmp(gc->fontfamily,"symbol")==0){
-	    NSString *tmp = [[NSString alloc] initWithBytes:str length:strlen(str) encoding:NSSymbolStringEncoding];
-		attrStr = [[[NSAttributedString alloc] initWithString:tmp
-										attributes:attr] autorelease];
+	NSSize bbox = [text sizeWithAttributes:attr];
-	} else {
-	 attrStr = [[[NSAttributedString alloc] initWithString:[NSString stringWithCString:str]
-										attributes:attr] autorelease];
-	}
-	[xd->DevTextStorage replaceCharactersInRange:NSMakeRange(0,[xd->DevTextStorage length])
-						 withAttributedString:attrStr];
+	[text release];
-	[xd->DevLayoutManager glyphRangeForTextContainer:xd->DevTextContainer];
-	return [xd->DevLayoutManager usedRectForTextContainer:xd->DevTextContainer].size.width;
+	return bbox.width;
+}
 static void 	RQuartz_Text(double x, double y, char *str,
 			    double rot, double hadj,
 			    R_GE_gcontext *gc,
 			    NewDevDesc *dd)
+{
+	NSString *text = nil;
 	QuartzDesc *xd = (QuartzDesc*)dd->deviceSpecific;
+	if(gc->fontface==5  || strcmp(gc->fontfamily,"symbol")==0)
+	    text = [[NSString alloc] initWithBytes:str length:strlen(str) encoding:NSSymbolStringEncoding];
+	else
+		text = [[NSString stringWithUTF8String:str] retain];
+	if (!text) return; /* if for some reason the decoding didn't work, just get out, nothing to see */
 	NSColor* clr       = [NSColor colorWithCalibratedRed:(float)R_RED(gc->col)/255.0
-		 green:(float)R_GREEN(gc->col)/255.0
+												   green:(float)R_GREEN(gc->col)/255.0
-		 blue:(float)R_BLUE(gc->col)/255.0
+													blue:(float)R_BLUE(gc->col)/255.0
-		 alpha:(float)R_ALPHA(gc->col)/255.0];
+												   alpha:(float)R_ALPHA(gc->col)/255.0];
+	NSFont *font = RQuartz_Font(gc,  dd);
 	NSDictionary* attr = [NSDictionary dictionaryWithObjectsAndKeys:
-		RQuartz_Font(gc,  dd), NSFontAttributeName,
+		font, NSFontAttributeName,
 		clr, NSForegroundColorAttributeName,
-		NULL];
+		nil];
-		NSAttributedString *attrStr;
-	if(gc->fontface==5  || strcmp(gc->fontfamily,"symbol")==0){
-	    NSString *tmp = [[NSString alloc] initWithBytes:str length:strlen(str) encoding:NSSymbolStringEncoding];
-		attrStr = [[[NSAttributedString alloc] initWithString:tmp
-										attributes:attr] autorelease];
-	} else {
-	 attrStr = [[[NSAttributedString alloc] initWithString:[NSString stringWithUTF8String:str]
-										attributes:attr] autorelease];
-	}
-	[xd->DevTextStorage replaceCharactersInRange:NSMakeRange(0,[xd->DevTextStorage length])
-						 withAttributedString:attrStr];
-	[xd->DevLayoutManager glyphRangeForTextContainer:xd->DevTextContainer];
-	NSRange glyphRange = [xd->DevLayoutManager glyphRangeForTextContainer: xd->DevTextContainer];
-		[xd->DevView lockFocus];
+	[xd->DevView lockFocus];
 	NSRectClip(ClipArea);
-	double h = [xd->DevLayoutManager usedRectForTextContainer:xd->DevTextContainer].size.height;
+	//NSSize bbox = [text sizeWithAttributes:attr];
 	NSAffineTransform *tns = [NSAffineTransform transform];
 	[tns translateXBy:x yBy:y];
 	[tns rotateByDegrees:-rot];
+	// in theory it should be sufficient to shift by the ascender, but obviously R is providing the wrong coordinates ...
+	[tns translateXBy:0 yBy:-[font ascender]+[font descender]];
-	[tns translateXBy:0 yBy:-h];	// Adjust a bit, why?
+	//[tns translateXBy:0 yBy:-bbox.height];
 	[tns concat];
-	[xd->DevLayoutManager drawGlyphsForGlyphRange: glyphRange atPoint: NSMakePoint(0,0)];
+	[text drawAtPoint:NSMakePoint(0,0) withAttributes:attr];
+	[text release];
-		[xd->DevView unlockFocus];
+	[xd->DevView unlockFocus];
+}
 static void 	RQuartz_Rect(double x0, double y0, double x1, double y1,
 			    R_GE_gcontext *gc,
 			    NewDevDesc *dd)
 				  R_GE_gcontext *gc,
 				  double* ascent, double* descent,
 				  double* width,
 				  NewDevDesc *dd)
+{
-	QuartzDesc *xd = (QuartzDesc*)dd->deviceSpecific;
+	//QuartzDesc *xd = (QuartzDesc*)dd->deviceSpecific;
 	NSFont* font= RQuartz_Font(gc,dd);
-	NSRect rect,rect2;
 	unichar uc = (unichar)c;
 	char str[2];
 	str[1] = '\0';
 	str[0] = (char)c;
-	if(c==0){
-		rect = [font boundingRectForFont];
-	 } else {
+	*ascent = [font ascender];
+	*descent = [font descender];
+	*width = [font maximumAdvancement].width;
+	if (c) {
-		 NSDictionary* attr = [NSDictionary dictionaryWithObjectsAndKeys:
+		NSDictionary* attr = [NSDictionary dictionaryWithObjectsAndKeys:
 			font, NSFontAttributeName,
-			NULL];
+			nil];
-		 NSAttributedString *attrStr;
+		NSString *text = nil;
-		if(gc->fontface==5  ||strcmp(gc->fontfamily,"symbol")==0){
+		if(gc->fontface==5  ||strcmp(gc->fontfamily,"symbol")==0)
-			NSString *tmp = [[NSString alloc] initWithBytes:str length:1 encoding:NSSymbolStringEncoding];
+			text = [[NSString alloc] initWithBytes:str length:1 encoding:NSSymbolStringEncoding];
-			attrStr = [[[NSAttributedString alloc] initWithString:tmp
-										attributes:attr] autorelease];
-		} else {
+		else
-			attrStr = [[[NSAttributedString alloc] initWithString:[NSString stringWithCharacters:&uc length:1]
+			text = [[NSString stringWithCharacters:&uc length:1] retain];
-										attributes:attr] autorelease];
-		}
+		*width = [text sizeWithAttributes: attr].width;
-		[xd->DevTextStorage replaceCharactersInRange:NSMakeRange(0, [xd->DevTextStorage length])
-						 withAttributedString:attrStr];
+		[text release];
-		[xd->DevLayoutManager glyphRangeForTextContainer:xd->DevTextContainer];
-		//NSLog(@"glyphs=%d",  [xd->DevLayoutManager numberOfGlyphs] );
-		rect = [xd->DevLayoutManager usedRectForTextContainer:xd->DevTextContainer];
-		rect2 = [font boundingRectForGlyph: [xd->DevLayoutManager glyphAtIndex:0]];
-	 }
+	}
-	*ascent  =  NSMaxY(rect);
-	*descent = -NSMinY(rect);
-	*width   = NSWidth(rect);
 	//fprintf(stderr,"c=%c,ascent=%f, descent=%f,width=%f,width2=%f,width3=%f\n",c,*ascent , *descent, *width, *width+rect2.origin.x,NSWidth(rect));
 //	NSLog(@"x=%f,y=%f,width=%f,height=%f",rect.origin.x, rect.origin.y,rect.size.width,rect.size.height);
 //	NSLog(@"x=%f,y=%f,width=%f,height=%f",rect2.origin.x, rect2.origin.y,rect2.size.width,rect2.size.height);

The R Project SVN R-packages

(root)/trunk/Mac-GUI/Quartz/QuartzDevice.m – Rev 1366 → 1558