Re: [Pharo-project] Graphics fixes?

March 20, 2010


      2010/3/20 StÃ©phane Ducasse <stephane.ducasse@inria.fr>:
...
Hi nicolas
last week you pushed some squeak rendering fixes to pharo and I was wondering if the recent ones on squeak should be considered.
Stef
Yes.
I just analyzed the diffs between CharacterScanner & subclasses with
MultiCharacterScanner family and fixed the diffs.
It would be far better to have Test Cases !!!
Last change is a just a clean-up, Writing the whileFalse depending on
true exit condition rather than an infinite loop with exit returns
seems cleaner to me.

Nicolas
...
commits@source.squeak.org
Â to squeak-dev, packages
show details 6:44 PM (15 hours ago)
Nicolas Cellier uploaded a new version of Graphics to project The Trunk:
http://source.squeak.org/trunk/Graphics-nice.121.mcz
==================== Summary ====================
Name: Graphics-nice.121
Author: nice
Time: 19 March 2010, 6:44:28.896 pm
UUID: 62e03b94-65c3-614f-b0f0-76c0476055e7
Ancestors: Graphics-ar.120
1) Add some missing pendingKernX reset.
2) explicit a loop dependency on stopCondition
=============== Diff against Graphics-ar.120 ===============
Item was changed:
Â ----- Method: CharacterScanner>>plainTab (in category 'scanning') -----
Â plainTab
Â  Â  Â  "This is the basic method of adjusting destX for a tab."
Â  Â  Â  destX := (alignment = Justified and: [self leadingTab not])
Â  Â  Â  Â  Â  Â  Â  ifTrue: Â  Â  Â  Â  "embedded tabs in justified text are weird"
Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  [destX + (textStyle tabWidth - (line justifiedTabDeltaFor: spaceCount)) max: destX]
Â  Â  Â  Â  Â  Â  Â  ifFalse:
Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  [textStyle nextTabXFrom: destX
Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  leftMargin: leftMargin
+ Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  rightMargin: rightMargin].
+ Â  Â  Â  pendingKernX := 0.!
- Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  rightMargin: rightMargin]!
Item was changed:
Â ----- Method: DisplayScanner>>paddedSpace (in category 'stop conditions') -----
Â paddedSpace
Â  Â  Â  "Each space is a stop condition when the alignment is right justified.
Â  Â  Â  Padding must be added to the base width of the space according to
Â  Â  Â  which space in the line this space is and according to the amount of
Â  Â  Â  space that remained at the end of the line when it was composed."
Â  Â  Â  spaceCount := spaceCount + 1.
Â  Â  Â  destX := destX + spaceWidth + (line justifiedPadFor: spaceCount font: font).
Â  Â  Â  lastIndex := lastIndex + 1.
+ Â  Â  Â  pendingKernX := 0.
Â  Â  Â  ^ false!
Item was changed:
Â ----- Method: CharacterBlockScanner>>characterBlockAtPoint:index:in: (in category 'scanning') -----
Â characterBlockAtPoint: aPoint index: index in: textLine
Â  Â  Â  "This method is the Morphic characterBlock finder. Â It combines
Â  Â  Â  MVC's characterBlockAtPoint:, -ForIndex:, and buildCharcterBlock:in:"
+ Â  Â  Â  | runLength lineStop stopCondition |
- Â  Â  Â  | runLength lineStop done stopCondition |
Â  Â  Â  line := textLine.
Â  Â  Â  rightMargin := line rightMargin.
Â  Â  Â  lastIndex := line first.
Â  Â  Â  self setStopConditions. Â  Â  Â  Â  "also sets font"
Â  Â  Â  characterIndex := index. Â " == nil means scanning for point"
Â  Â  Â  characterPoint := aPoint.
Â  Â  Â  (characterPoint isNil or: [characterPoint y > line bottom])
Â  Â  Â  Â  Â  Â  Â  ifTrue: [characterPoint := line bottomRight].
Â  Â  Â  (text isEmpty or: [(characterPoint y < line top or: [characterPoint x < line left])
Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  or: [characterIndex notNil and: [characterIndex < line first]]])
Â  Â  Â  Â  Â  Â  Â  ifTrue: [^ (CharacterBlock new stringIndex: line first text: text
Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  topLeft: line leftMargin@line top extent: 0 @ textStyle lineGrid)
Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  textLine: line].
Â  Â  Â  destX := leftMargin := line leftMarginForAlignment: alignment.
Â  Â  Â  destY := line top.
Â  Â  Â  runLength := text runLengthFor: line first.
Â  Â  Â  characterIndex
Â  Â  Â  Â  Â  Â  Â  ifNotNil: Â  Â  Â  [lineStop := characterIndex Â "scanning for index"]
Â  Â  Â  Â  Â  Â  Â  ifNil: Â [lineStop := line last Â "scanning for point"].
Â  Â  Â  runStopIndex := lastIndex + (runLength - 1) min: lineStop.
Â  Â  Â  lastCharacterExtent := 0 @ line lineHeight.
Â  Â  Â  spaceCount := 0.
+ Â  Â  Â  [
+ Â  Â  Â  Â  Â  Â  Â  stopCondition := self scanCharactersFrom: lastIndex to: runStopIndex
- Â  Â  Â  done Â := false.
- Â  Â  Â  [done] whileFalse:
- Â  Â  Â  Â  Â  Â  Â  [stopCondition := self scanCharactersFrom: lastIndex to: runStopIndex
Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  in: text string rightX: characterPoint x
Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  stopConditions: stopConditions kern: kern.
+ Â  Â  Â  Â  Â  Â  Â  "see setStopConditions for stopping conditions for character block operations."
- Â  Â  Â  Â  Â  Â  Â  "see setStopConditions for stopping conditions for character block Â  Â  Â operations."
Â  Â  Â  Â  Â  Â  Â  self lastCharacterExtentSetX: (specialWidth
Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  ifNil: [font widthOf: (text at: lastIndex)]
Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  ifNotNil: [specialWidth]).
+ Â  Â  Â  Â  Â  Â  Â  self perform: stopCondition
+ Â  Â  Â  ] whileFalse.
+ Â  Â  Â  characterIndex
+ Â  Â  Â  Â  Â  Â  Â  ifNil: [
+ Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  "Result for characterBlockAtPoint: "
+ Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  (stopCondition ~~ #cr and: [ lastIndex == line last
+ Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  and: [ aPoint x > ((characterPoint x) + (lastCharacterExtent x / 2)) ]])
+ Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  ifTrue: [ "Correct for right half of last character in line"
+ Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  ^ (CharacterBlock new stringIndex: lastIndex + 1
+ Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  text: text
+ Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  topLeft: characterPoint + (lastCharacterExtent x @ 0) + (font descentKern @ 0)
+ Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  extent: Â 0 @ lastCharacterExtent y)
+ Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  textLine: line ].
+ Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  ^ (CharacterBlock new
+ Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  stringIndex: lastIndex
+ Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  text: text topLeft: characterPoint + (font descentKern @ 0)
+ Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  extent: lastCharacterExtent - (font baseKern @ 0))
+ Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  textLine: line]
+ Â  Â  Â  Â  Â  Â  Â  ifNotNil: ["Result for characterBlockForIndex: "
+ Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  ^ (CharacterBlock new
+ Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  stringIndex: characterIndex
+ Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  text: text topLeft: characterPoint + ((font descentKern) - kern @ 0)
+ Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  extent: lastCharacterExtent)
+ Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  textLine: line]!
- Â  Â  Â  Â  Â  Â  Â  (self perform: stopCondition) ifTrue:
- Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  [characterIndex
- Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  ifNil: [
- Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  "Result for characterBlockAtPoint: "
- Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  (stopCondition ~~ #cr and: [ lastIndex == line last
- Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  and: [ aPoint x > ((characterPoint x) + (lastCharacterExtent x / 2)) ]])
- Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  ifTrue: [ "Correct for right half of last character in line"
- Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  ^ (CharacterBlock new stringIndex: lastIndex + 1
- Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  text: text
- Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  topLeft: characterPoint + (lastCharacterExtent x @ 0) + (font descentKern @ 0)
- Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  extent: Â 0 @ lastCharacterExtent y)
- Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  textLine: line ].
- Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  ^ (CharacterBlock new stringIndex: lastIndex
- Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  text: text topLeft: characterPoint + (font descentKern @ 0)
- Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  extent: lastCharacterExtent - (font baseKern @ 0))
- Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  textLine: line]
- Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  ifNotNil: ["Result for characterBlockForIndex: "
- Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  ^ (CharacterBlock new stringIndex: characterIndex
- Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  text: text topLeft: characterPoint + ((font descentKern) - kern @ 0)
- Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  extent: lastCharacterExtent)
- Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  Â  textLine: line]]]!
_______________________________________________
Pharo-project mailing list
Pharo-project@lists.gforge.inria.fr
http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project