--- a/XftFontDescription.st Mon Jan 06 16:16:40 2014 +0100
+++ b/XftFontDescription.st Tue Jan 07 00:01:19 2014 +0100
@@ -341,7 +341,7 @@
!XftFontDescription methodsFor:'displaying'!
-displayString:aString from:index1 to:index2 x:x y:y in:aGC opaque:opaque
+displayString:aString from:index1 to:index2 x:xArg y:yArg in:aGC opaque:opaque
"display a partial string at some position in aGC."
| bitsPerCharacter clipR clipX clipY clipW clipH fg fgR fgG fgB fgA fgPixel bg bgR bgG bgB bgA bgPixel displayId screen drawableId error |
@@ -430,7 +430,7 @@
XftTextExtents32( DISPLAY( displayId ), XFT_FONT( __INST( fontId ) ), (FcChar32*)string, len, &extents);
break;
}
- XftDrawRect( XFT_DRAW ( __INST( drawId ) ), &color, __intVal(x) - extents.x, __intVal(y) - XFT_FONT( __INST( fontId ) )->ascent, extents.width, XFT_FONT(__INST (fontId ) )->height);
+ XftDrawRect( XFT_DRAW ( __INST( drawId ) ), &color, __intVal(xArg) - extents.x, __intVal(yArg) - XFT_FONT( __INST( fontId ) )->ascent, extents.width, XFT_FONT(__INST (fontId ) )->height);
}
color.pixel = (unsigned long)__intVal(fgPixel);
color.color.red = __intVal(fgR);
@@ -440,24 +440,24 @@
switch (bytesPerCharacter) {
case 1:
XftDrawString8( XFT_DRAW ( __INST( drawId ) ), &color, XFT_FONT( __INST( fontId ) ),
- __intVal(x),
- __intVal(y),
+ __intVal(xArg),
+ __intVal(yArg),
(FcChar8*)string,
len);
RETURN ( self );
break;
case 2:
XftDrawString16( XFT_DRAW ( __INST( drawId ) ), &color, XFT_FONT( __INST( fontId ) ),
- __intVal(x),
- __intVal(y),
+ __intVal(xArg),
+ __intVal(yArg),
(FcChar16*)string,
len);
RETURN ( self );
break;
case 4:
XftDrawString32( XFT_DRAW ( __INST( drawId ) ), &color, XFT_FONT( __INST( fontId ) ),
- __intVal(x),
- __intVal(y),
+ __intVal(xArg),
+ __intVal(yArg),
(FcChar32*)string,
len);
RETURN ( self );
@@ -1380,11 +1380,11 @@
!XftFontDescription class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libview/XftFontDescription.st,v 1.17 2014-01-06 15:16:40 vrany Exp $'
+ ^ '$Header: /cvs/stx/stx/libview/XftFontDescription.st,v 1.18 2014-01-06 23:01:19 cg Exp $'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libview/XftFontDescription.st,v 1.17 2014-01-06 15:16:40 vrany Exp $'
+ ^ '$Header: /cvs/stx/stx/libview/XftFontDescription.st,v 1.18 2014-01-06 23:01:19 cg Exp $'
! !