--- a/XftFontDescription.st	Thu Sep 01 23:27:10 2016 +0100
+++ b/XftFontDescription.st	Mon Aug 01 23:30:02 2016 +0100
@@ -477,7 +477,7 @@
     ].
     bytesPerCharacter := aString bitsPerCharacter // 8.
 
-    clipRect := aGC deviceClippingRectangle.
+    clipRect := aGC deviceClippingBoundsOrNil.
     clipRect notNil ifTrue:[
         clipX := clipRect left.
         clipY := clipRect top.
@@ -549,7 +549,7 @@
         drawId := aGC xftDrawId.
         drawIdIsShared := false.
         drawId isNil ifTrue:[
-%{
+%{  /* STACK: 64000 */
             if (pixmapDepth != nil) {
                 int __pixmapDepth = __intVal(pixmapDepth);
                 if (__pixmapDepth == 1) {      
@@ -574,7 +574,7 @@
         drawIdIsShared := true.
     ].
 
-%{  /* UNLIMITEDSTACK */
+%{  /* STACK: 64000 */
 #ifdef XFT
     XftColor color;
     XGlyphInfo extents;
@@ -1013,7 +1013,7 @@
 	]
     ].
     pix := aColor colorId.
-%{  /* UNLIMITEDSTACK */
+%{  /* STACK: 64000 */
 #ifdef XFT
     XftColor clr;
     if ( ! __isExternalAddressLike(drawIdArg) ) {
@@ -1068,7 +1068,7 @@
 	wObj := rect width.
 	hObj := rect height.
     ].
-%{  /* UNLIMITEDSTACK */
+%{  /* STACK: 64000 */
 #ifdef XFT
     XRectangle r;
     if ( ! __isExternalAddressLike(drawIdArg) ) {
@@ -1111,7 +1111,7 @@
 	]
     ].
     pix := aColor colorId.
-%{  /* UNLIMITEDSTACK */
+%{  /* STACK: 64000 */
 #ifdef XFT
     int _start, _stop;
     int __x, __y;
@@ -1278,7 +1278,7 @@
 xftFontMatch: displayId screen: screen pattern: patternId
     | error |
 
-%{ /* UNLIMITEDSTACK */
+%{ /* STACK: 64000 */
 #ifdef XFT
     XftPattern* p;
     XftResult r;
@@ -1317,7 +1317,7 @@
 
     | error |
 
-%{  /* UNLIMITEDSTACK */
+%{  /* STACK: 64000 */
 #ifdef XFT
     XftFont* f;
     if ( ! __isExternalAddressLike(displayId) ) {
@@ -1348,7 +1348,7 @@
 
     extents :=  Array new: 6.
     bitsPerCharacter := text bitsPerCharacter.
-%{  /* UNLIMITEDSTACK */
+%{  /* STACK: 64000 */
 #ifdef XFT
     XGlyphInfo info;
     int bytesPerCharacter;