hg/stx-libview: comparison XftFontDescription.st

equal deleted inserted replaced

-:47ed6ce16ea2
+:cf89c4bedea4
 "{ Package: 'stx:libview' }"
 FontDescription subclass:#XftFontDescription
-	instanceVariableNames:'device fontId drawId closestFont minCode maxCode'
+	instanceVariableNames:'device fontId sharedDrawId closestFont minCode maxCode'
 	classVariableNames:'FC_FAMILY FC_STYLE FC_SLANT FC_WEIGHT FC_SIZE FC_ASPECT
 		FC_PIXEL_SIZE FC_SPACING FC_FOUNDRY FC_ANTIALIAS FC_HINTING
 		FC_HINT_STYLE FC_VERTICAL_LAYOUT FC_AUTOHINT FC_WIDTH FC_FILE
 		FC_INDEX FC_FT_FACE FC_RASTERIZER FC_OUTLINE FC_SCALABLE FC_SCALE
 		FC_DPI FC_RGBA FC_MINSPACE FC_SOURCE FC_CHARSET FC_LANG
 ! !
 !XftFontDescription class methodsFor:'instance creation'!
 family:familyString face:faceString style:styleString size:size sizeUnit:sizeUnit encoding:encoding
 "returns a font for given family, face, style, size and the specified encoding.
 The returned font is not associated to a specific device"
 |proto|
 CachedFontList notNil ifTrue:[
 proto := CachedFontList
 detect:[:fn |
 fn family = familyString
 and:[ fn face = faceString
 and:[ (fn style = styleString
 or:[ (fn style = 'oblique' and:[styleString = 'italic'])
 or:[ (fn style = 'italic' and:[styleString = 'oblique']) ]]) ]]]
 ifNone:nil.
 proto notNil ifTrue:[
 ^ (proto shallowCopy)
 setDevice: nil patternId: nil fontId: nil;
 family:familyString face:faceString style:styleString size:size sizeUnit:sizeUnit encoding:encoding
 ].
 bgR := bgG := bgB := 16rFFFF.
 ]
 ].
 ].
 displayId := device displayIdOrErrorIfBroken.
 displayId isNil ifTrue:[
 ^ self.
 ].
 screen := device screen.
 drawableId := aGC drawableId.
 goto err;
 }
 __bytesPerCharacter = __intVal(bytesPerCharacter);
-if ( __INST(drawId) == nil ) {
+if ( __INST(sharedDrawId) == nil ) {
-__INST(drawId) = XFT_DRAW_HANDLE_NEW ( XftDrawCreate ( DISPLAY( displayId ) ,
+__INST(sharedDrawId) = XFT_DRAW_HANDLE_NEW ( XftDrawCreate ( DISPLAY( displayId ) ,
 DRAWABLE( drawableId ) ,
 DefaultVisual( DISPLAY( displayId), SCREEN (screen) ) ,
 DefaultColormap( DISPLAY( displayId), SCREEN (screen) ) ) );
-__STORE(self, __INST(drawId));
+__STORE(self, __INST(sharedDrawId));
 }
-if ( XftDrawDrawable ( XFT_DRAW ( __INST(drawId) ) ) != DRAWABLE( drawableId ) ) {
+if ( XftDrawDrawable ( XFT_DRAW ( __INST(sharedDrawId) ) ) != DRAWABLE( drawableId ) ) {
-XftDrawChange( XFT_DRAW( __INST(drawId) ) , DRAWABLE( drawableId ) );
+XftDrawChange( XFT_DRAW( __INST(sharedDrawId) ) , DRAWABLE( drawableId ) );
 }
 string = __stringVal( aString ) + (( __intVal(index1) - 1 ) * __bytesPerCharacter);
 len = __intVal(index2) - __intVal(index1) + 1;
 if (clipR != nil) {
 clipRX.x = __intVal(clipX);
 clipRX.y = __intVal(clipY);
 clipRX.width = __intVal(clipW);
 clipRX.height = __intVal(clipH);
-XftDrawSetClipRectangles( XFT_DRAW( __INST( drawId ) ) , 0, 0, &clipRX, 1);
+XftDrawSetClipRectangles( XFT_DRAW( __INST( sharedDrawId ) ) , 0, 0, &clipRX, 1);
 } else {
-XftDrawSetClip( XFT_DRAW( __INST( drawId ) ) , 0);
+XftDrawSetClip( XFT_DRAW( __INST( sharedDrawId ) ) , 0);
 }
 if (opaque == true) {
 if (bgPixel != nil) {
 color.pixel = (unsigned long)__intVal(bgPixel);
 break;
 case 4:
 XftTextExtents32( DISPLAY( displayId ), XFT_FONT( __INST( fontId ) ), (FcChar32*)string, len, &extents);
 break;
 }
-XftDrawRect( XFT_DRAW ( __INST( drawId ) ), &color, __intVal(drawX) - extents.x, __intVal(drawY) - XFT_FONT( __INST( fontId ) )->ascent, extents.width, XFT_FONT(__INST (fontId ) )->height);
+XftDrawRect( XFT_DRAW ( __INST( sharedDrawId ) ), &color, __intVal(drawX) - extents.x, __intVal(drawY) - XFT_FONT( __INST( fontId ) )->ascent, extents.width, XFT_FONT(__INST (fontId ) )->height);
 }
 if (fgPixel != nil) {
 color.pixel = (unsigned long)__intVal(fgPixel);
 }
 // else {
 color.color.blue = __intVal(fgB);
 color.color.alpha = __intVal(fgA);
 // }
 switch (__bytesPerCharacter) {
 case 1:
-XftDrawString8( XFT_DRAW ( __INST( drawId ) ), &color, XFT_FONT( __INST( fontId ) ),
+XftDrawString8( XFT_DRAW ( __INST( sharedDrawId ) ), &color, XFT_FONT( __INST( fontId ) ),
 __intVal(drawX),
 __intVal(drawY),
 (FcChar8*)string,
 len);
 RETURN ( self );
 break;
 case 2:
-XftDrawString16( XFT_DRAW ( __INST( drawId ) ), &color, XFT_FONT( __INST( fontId ) ),
+XftDrawString16( XFT_DRAW ( __INST( sharedDrawId ) ), &color, XFT_FONT( __INST( fontId ) ),
 __intVal(drawX),
 __intVal(drawY),
 (FcChar16*)string,
 len);
 RETURN ( self );
 break;
 case 4:
-XftDrawString32( XFT_DRAW ( __INST( drawId ) ), &color, XFT_FONT( __INST( fontId ) ),
+XftDrawString32( XFT_DRAW ( __INST( sharedDrawId ) ), &color, XFT_FONT( __INST( fontId ) ),
 __intVal(drawX),
 __intVal(drawY),
 (FcChar32*)string,
 len);
 RETURN ( self );
 view isNil ifTrue:[ ^ self ].
 drawableId := view id.
 drawableId isNil ifTrue: [ ^ self ].
 %{
 #ifdef XFT
-if ( __INST(drawId) != nil ) {
+if ( __INST(sharedDrawId) != nil ) {
-if (XftDrawDrawable(XFT_DRAW(__INST(drawId))) == DRAWABLE(drawableId)) {
+if (XftDrawDrawable(XFT_DRAW(__INST(sharedDrawId))) == DRAWABLE(drawableId)) {
-__INST(drawId) = nil;
+__INST(sharedDrawId) = nil;
 XftDrawDestroy(DRAWABLE(drawableId));
 }
 }
 RETURN (self);
 #endif
 releaseFromDevice
 "I am no longer available on the device"
 device := nil.
 fontId := nil.
-drawId := nil.
+sharedDrawId := nil.
 closestFont := nil
 ! !
 !XftFontDescription methodsFor:'testing'!
 isUsed
-^ drawId notNil
+^ sharedDrawId notNil
 !
 isXftFont
 ^ true
 ! !
 "helper for font listing"
 |page bits l min max minCode maxCode|
 [ l := pipeStream nextLine. l notEmpty ] whileTrue:[
 "/ Transcript show:'->'; showCR:l.
 (l startsWith:Character tab) ifFalse:[
 (l startsWith:'(') ifFalse:[self halt].
 currentDescription minCode:minCode.
 currentDescription maxCode:maxCode.
 ^ self.
 ].
 lineStream := l readStream.
 lineStream skipSeparators.
 page := Integer readFrom:(lineStream upTo:$:) radix:16.
 lineStream next.
 bits := 0 to:7 collect:[:i|
 lineStream skipSeparators.
 Integer readFrom:(lineStream upToSeparator) radix:16.
 ].
 min := (page * 256 + 0).
 max := (page * 256 + 255).
 minCode isNil ifTrue:[
 minCode := min.
 maxCode := max.
 ] ifFalse:[
 minCode := minCode min:min.
 maxCode := maxCode max:max.
 ].
 ].
 "/ currentDescription characterSet:(self getString).
 currentDescription minCode:minCode.
 currentDescription maxCode:maxCode.
 !
 fc_decorative
 |xftStyle|
 xftStyle := self getString.
 (xftStyle includesString:'Bold') ifTrue:[
 currentDescription face:'bold'.
 currentDescription style:'roman'.
 ^ self.
 ].
 (xftStyle includesString:'Italic') ifTrue:[
 currentDescription face:'medium'.
 currentDescription style:'italic'.
 ^ self.
 ].
 (xftStyle includesString:'Oblique') ifTrue:[
 currentDescription face:'medium'.
 currentDescription style:'italic'.
 ^ self.
 ].
 "/ self halt.
 currentDescription face:'medium'.
 currentDescription style:'roman'.
 !
 fc_stylelang
 "helper for font listing"
 ! !
 !XftFontDescription class methodsFor:'documentation'!
 version
-^ '$Header: /cvs/stx/stx/libview/XftFontDescription.st,v 1.43 2014-03-24 19:22:49 stefan Exp $'
+^ '$Header: /cvs/stx/stx/libview/XftFontDescription.st,v 1.44 2014-04-01 13:26:51 vrany Exp $'
 !
 version_CVS
-^ '$Header: /cvs/stx/stx/libview/XftFontDescription.st,v 1.43 2014-03-24 19:22:49 stefan Exp $'
+^ '$Header: /cvs/stx/stx/libview/XftFontDescription.st,v 1.44 2014-04-01 13:26:51 vrany Exp $'
 ! !
 XftFontDescription initialize!

changeset 6365	cf89c4bedea4
parent 6356	bbb356d49430
child 6389	5a9f9d83b7c4