hg/stx-libview: comparison XWorkstation.st

equal deleted inserted replaced

-:d1cebfa53c19
+:2de3e4caafbb
 !XWorkstation methodsFor:'font stuff'!
 createFontFor:aFontName
 "a basic method for X-font allocation; this method allows
-any font to be aquired (even those not conforming to
+any font to be acquired (even those not conforming to
 standard naming conventions, such as cursor, fixed or k14)"
 <context: #return>
 %{  /* STACK: 100000 */
 XFontStruct *newFont;
 if (ISCONNECTED
 && __isStringLike(aFontName)) {
-	ENTER_XLIB();
+ENTER_XLIB();
-	newFont = XLoadQueryFont(myDpy, (char *)__stringVal(aFontName));
+newFont = XLoadQueryFont(myDpy, (char *)__stringVal(aFontName));
-	LEAVE_XLIB();
+LEAVE_XLIB();
 #ifdef COUNT_RESOURCES
-	if (newFont)
+if (newFont)
-	    __cnt_font++;
+__cnt_font++;
 #endif
-	RETURN ( newFont ? __MKEXTERNALADDRESS(newFont) : nil );
+RETURN ( newFont ? __MKEXTERNALADDRESS(newFont) : nil );
 }
 %}.
 "/ --- disabled due to UNLIMITEDSTACK -- self primitiveFailedOrClosedConnection.
 ^ nil
 !
 Screen current getDefaultFontWithEncoding:#'iso10646-1'
 "
 !
 getFontWithFamily:familyString face:faceString
-	    style:styleArgString size:sizeArgOrNil sizeUnit:sizeUnit encoding:encoding
+style:styleArgString size:sizeArgOrNil sizeUnit:sizeUnit encoding:encoding
 "try to get the specified font, if not available, try next smaller
 font. Access to X-fonts by name is possible, by passing the X font name
 as family and the other parameters as nil. For example, the cursor font
-can be aquired that way."
+can be acquired that way."
 |styleString theName theId xlatedStyle
 id spacing encodingMatch idx roundedSize pixelSize pointSize|
 styleString := styleArgString.
 sizeArgOrNil notNil ifTrue:[
-	roundedSize := sizeArgOrNil rounded asInteger.
+roundedSize := sizeArgOrNil rounded asInteger.
-	sizeUnit == #px ifTrue:[
+sizeUnit == #px ifTrue:[
-	    pixelSize := roundedSize.
+pixelSize := roundedSize.
-	] ifFalse:[
+] ifFalse:[
-	    pointSize := roundedSize.
+pointSize := roundedSize.
-	].
+].
 ].
 "special: if face is nil, allow access to X-fonts"
 faceString isNil ifTrue:[
-	roundedSize notNil ifTrue:[
+roundedSize notNil ifTrue:[
-	    theName := familyString , '-' , roundedSize printString
+theName := familyString , '-' , roundedSize printString
-	] ifFalse:[
+] ifFalse:[
-	    theName := familyString
+theName := familyString
-	].
+].
-	theName notNil ifTrue:[
+theName notNil ifTrue:[
-	    theId := self createFontFor:theName.
+theId := self createFontFor:theName.
-	].
+].
-	theId isNil ifTrue:[
+theId isNil ifTrue:[
-	    theId := self getDefaultFontWithEncoding:encoding
+theId := self getDefaultFontWithEncoding:encoding
-	].
+].
-	^ theId
+^ theId
 ].
 "/ spacing other than 'normal' is contained as last component
 "/ in style
 (styleString notNil
 and:[(styleString endsWith:'-narrow')
-	  or:[styleString endsWith:'-semicondensed']]) ifTrue:[
+or:[styleString endsWith:'-semicondensed']]) ifTrue:[
-	|i|
+|i|
-	i := styleString lastIndexOf:$-.
+i := styleString lastIndexOf:$-.
-	spacing := styleString copyFrom:(i+1).
+spacing := styleString copyFrom:(i+1).
-	styleString := styleString copyTo:(i-1).
+styleString := styleString copyTo:(i-1).
 ] ifFalse:[
-	spacing := 'normal'.
+spacing := 'normal'.
 ].
 xlatedStyle := styleString.
 xlatedStyle notNil ifTrue:[
-	xlatedStyle := xlatedStyle first asString
+xlatedStyle := xlatedStyle first asString
 ].
 encoding isNil ifTrue:[
-	encodingMatch := '*-*'.
+encodingMatch := '*-*'.
 ] ifFalse:[
-	idx := encoding indexOf:$-.
+idx := encoding indexOf:$-.
-	idx ~~ 0 ifTrue:[
+idx ~~ 0 ifTrue:[
-	    encodingMatch := encoding
+encodingMatch := encoding
-	] ifFalse:[
+] ifFalse:[
-	    encodingMatch := encoding , '-*'.
+encodingMatch := encoding , '-*'.
-	].
+].
 ].
 id := self
-	    getFontWithFoundry:'*'
+getFontWithFoundry:'*'
-	    family:familyString asLowercase
+family:familyString asLowercase
-	    weight:faceString
+weight:faceString
-	    slant:xlatedStyle
+slant:xlatedStyle
-	    spacing:spacing
+spacing:spacing
-	    pixelSize:pixelSize
+pixelSize:pixelSize
-	    size:pointSize
+size:pointSize
-	    encoding:encodingMatch.
+encoding:encodingMatch.
 id isNil ifTrue:[
-	(encodingMatch notNil and:[encodingMatch ~= '*']) ifTrue:[
+(encodingMatch notNil and:[encodingMatch ~= '*']) ifTrue:[
-	    "/ too stupid: registries come in both cases
+"/ too stupid: registries come in both cases
-	    "/ and X does not ignore case
+"/ and X does not ignore case
-	    "/
+"/
-	    id := self
+id := self
-		    getFontWithFoundry:'*'
+getFontWithFoundry:'*'
-		    family:familyString asLowercase
+family:familyString asLowercase
-		    weight:faceString
+weight:faceString
-		    slant:xlatedStyle
+slant:xlatedStyle
-		    spacing:spacing
+spacing:spacing
-		    pixelSize:nil
+pixelSize:nil
-		    size:roundedSize
+size:roundedSize
-		    encoding:encodingMatch asUppercase.
+encoding:encodingMatch asUppercase.
-	    id isNil ifTrue:[
+id isNil ifTrue:[
-		id := self
+id := self
-			getFontWithFoundry:'*'
+getFontWithFoundry:'*'
-			family:familyString asLowercase
+family:familyString asLowercase
-			weight:faceString
+weight:faceString
-			slant:xlatedStyle
+slant:xlatedStyle
-			spacing:spacing
+spacing:spacing
-			pixelSize:nil
+pixelSize:nil
-			size:roundedSize
+size:roundedSize
-			encoding:encodingMatch asLowercase.
+encoding:encodingMatch asLowercase.
-	    ]
+]
-	]
+]
 ].
 ^ id
 "Modified: 4.7.1996 / 11:38:47 / stefan"
 "Modified: 10.4.1997 / 19:20:06 / cg"

changeset 7409	2de3e4caafbb
parent 7371	d88ae8653ca8
child 7413	3ecf41208027
child 7489	07c626716aed