XftFontDescription.st
changeset 7050 f0f26dbce164
parent 7016 507dcc2e50df
child 7053 e44485fe1869
child 7054 9036fd6f3d83
--- a/XftFontDescription.st	Wed Oct 28 11:30:59 2015 +0100
+++ b/XftFontDescription.st	Thu Oct 29 01:12:18 2015 +0100
@@ -614,7 +614,7 @@
     "display a partial string at some position in aGC."
 
     |index2 bytesPerCharacter transformation
-     clipOrg clipCorn clipR clipB clipX clipY clipW clipH clipPnt
+     clipOrg clipCorn clipRect clipCX clipCY clipX clipY clipW clipH clipPnt
      fg fgR fgG fgB fgA fgPixel bg bgR bgG bgB bgA bgPixel
      drawX drawY drawPnt displayId screen drawableId error stringLen 
      newXftDrawId newDrawableAssociation|
@@ -630,27 +630,27 @@
     bytesPerCharacter := aString bitsPerCharacter // 8.
     transformation := aGC transformation.
 
-    clipR := aGC clippingBoundsOrNil.
+    clipRect := aGC clippingBoundsOrNil.
     
-    clipR notNil ifTrue:[
-        clipX := clipR left.
-        clipY := clipR top.
-        clipR := clipR right.
-        clipB := clipR bottom.
+    clipRect notNil ifTrue:[
+        clipX := clipRect left.
+        clipY := clipRect top.
+        clipCX := clipRect right.
+        clipCY := clipRect bottom.
         "/ YES YES YES: this MUST be transformed!!
         "/ (see htmlView) fix the notebook, please.
         transformation notNil ifTrue:[
-            clipOrg := transformation transformPoint:(clipR origin).
-            clipCorn := transformation transformPoint:(clipR corner).
+            clipOrg := transformation transformPoint:(clipRect origin).
+            clipCorn := transformation transformPoint:(clipRect corner).
             clipX := clipOrg x ceiling.
             clipY := clipOrg y ceiling.
-            clipR := clipCorn x ceiling.
-            clipB := clipCorn y ceiling.
-            clipW := clipR-clipX.
-            clipH := clipB-clipY.
+            clipCX := clipCorn x ceiling.
+            clipCY := clipCorn y ceiling.
 "/            clipX := (transformation applyToX:clipPnt x) ceiling.
 "/            clipY := (transformation applyToY:clipY) ceiling.
         ].
+        clipW := clipCX-clipX.
+        clipH := clipCY-clipY.
     ].
 
     transformation isNil ifTrue:[
@@ -753,7 +753,7 @@
     string = __stringVal(aString) + ((__intVal(index1) - 1 ) * __bytesPerCharacter);
     len = __intVal(index2) - __intVal(index1) + 1;
 
-    if (clipR != nil) {
+    if (clipRect != nil) {
         clipRX.x = __intVal(clipX);
         clipRX.y = __intVal(clipY);
         clipRX.width = __intVal(clipW);