hg/stx-libwidg: comparison ListView.st

equal deleted inserted replaced

-:920eba722168
+:e76979454c2f
 		textStartTop innerWidth tabPositions lineSpacing fontHeight
 		fontAscent fontIsFixedWidth fontWidth autoScroll autoScrollBlock
 		autoScrollDeltaT lastSearchPattern lastSearchIgnoredCase
 		wordCheck includesNonStrings widthOfWidestLine listMsg viewOrigin
 		listChannel backgroundAlreadyClearedColor'
-	classVariableNames:'DefaultForegroundColor DefaultBackgroundColor DefaultTabPositions'
+	classVariableNames:'DefaultForegroundColor DefaultBackgroundColor DefaultTabPositions
+			    DefaultLeftMargin DefaultTopMargin'
 	poolDictionaries:''
 	category:'Views-Text'
 !
 !ListView class methodsFor:'documentation'!
 firstLineShown      <Number>                the index of the 1st visible line (1 ..)
 leftOffset          <Number>                left offset for horizontal scroll
 nFullLinesShown     <Number>                the number of unclipped lines in visible area
-(internal; updated on size changes)
+						  (internal; updated on size changes)
 nLinesShown         <Number>                the number of lines in visible area, incl. partial
-(internal; updated on size changes)
+						  (internal; updated on size changes)
 fgColor             <Color>                 color to draw characters
 bgColor             <Color>                 the background
 partialLines        <Boolean>               allow last line to be partial displayed
 lastSearchPattern   <String>                last pattern for searching
 						  (kept to provide a default for next search)
 lastSearchIgnoredCase   <Boolean>           last search ignored case
 						  (kept to provide a default for next search)
 wordCheck           <Block>                 rule used for check for word boundaries in word select
-The default rule is to return true for alphaNumeric characters.
+						  The default rule is to return true for alphaNumeric characters.
-(can be changed to allow for underscore and other
+						  (can be changed to allow for underscore and other
-characters to be treated as alphaCharacters)
+						   characters to be treated as alphaCharacters)
 autoScrollBlock     <Block>                 block installed as timeoutBlock when doing an
-autoScroll (internal)
+						  autoScroll (internal)
 autoScrollDeltaT                            computed scroll time delta in seconds (internal)
 includesNonStrings                          cached flag if any non-strings are in list
 widthOfWidestLine                           cached width of widest line
 listMsg                                     if view has a model and listMsg is non-nil,
-this is sent to the model to aquired a new contents
+						  this is sent to the model to aquired a new contents
-whenever a change of the aspect  (aspectMsg) occurs.
+						  whenever a change of the aspect  (aspectMsg) occurs.
 viewOrigin                                  the current origin
-backgroundAlreadyClearedColor		  internal; speedup by avoiding
+backgroundAlreadyClearedColor               internal; speedup by avoiding
 						  multiple fills when drawing
 						  internal lines
 [StyleSheet parameters:]
 textBackgroundColor                         defaults to White
 textFont                                    defaults to defaultFont
 textTabPositions                            defaults to #(1 9 17 25 ...)
 [author:]
-Claus Gittinger
+	Claus Gittinger
 [see also:]
-TextView EditTextView
+	TextView EditTextView
 "
 !
 examples
 ! !
 !ListView class methodsFor:'defaults'!
 defaultTabPositions
+"return an array containing the default tab positions"
 ^ self tab8Positions
 !
 tab4Positions
+"return an array containing tab positions for 4-col tabs"
 ^ #(1 5 9 13 17 21 25 29 33 37 41 45 49 53 57 61 65 69 73 77 81
 	85 89 93 97 101 105 109 113 114 121 125 129 133 137 141 145)
 !
 tab8Positions
+"return an array containing tab positions for 8-col tabs"
 ^ #(1 9 17 25 33 41 49 57 65 73 81 89 97 105 113 121 129 137 145)
 !
 updateStyleCache
 "extract values from the styleSheet and cache them in class variables"
 <resource: #style (#'text.foregroundColor' #'text.backgroundColor'
-#'text.tabPositions'
+		       #'text.tabPositions'
-#'text.font')>
+		       #'text.font')>
 DefaultForegroundColor := StyleSheet colorAt:'text.foregroundColor' default:Black.
 DefaultBackgroundColor := StyleSheet colorAt:'text.backgroundColor' default:White.
 DefaultFont := StyleSheet fontAt:'text.font'.
 DefaultTabPositions := StyleSheet at:'text.tabPositions'.
 DefaultTabPositions isNil ifTrue:[DefaultTabPositions := self defaultTabPositions].
+DefaultLeftMargin := 0.5.
+DefaultTopMargin := 0.5.
 "Modified: 20.10.1997 / 15:05:30 / cg"
 ! !
 !ListView methodsFor:'accessing'!
 backgroundColor:aColor
 "set the background color of the contents"
 bgColor ~~ aColor ifTrue:[
-bgColor := aColor.
+	bgColor := aColor.
-self viewBackground:bgColor.
+	self viewBackground:bgColor.
-shown ifTrue:[
+	shown ifTrue:[
-self invalidate "/ clear; redraw
+	    self invalidate "/ clear; redraw
-]
+	]
 ]
 "Modified: 3.5.1997 / 10:27:40 / cg"
 !
 font:aFont
 "set the font for all shown text.
 Redraws everything.
 CAVEAT: with the addition of Text objects,
-this method is going to be obsoleted by a textStyle
+	     this method is going to be obsoleted by a textStyle
-method, which allows specific control over
+	     method, which allows specific control over
-normalFont/boldFont/italicFont parameters."
+	     normalFont/boldFont/italicFont parameters."
 aFont isNil ifTrue:[
-^ self error:'nil font'
+	^ self error:'nil font'
 ].
 font ~~ aFont ifTrue:[
-super font:(aFont on:device).
+	super font:(aFont on:device).
-preferredExtent := nil.
+	preferredExtent := nil.
-widthOfWidestLine := nil. "/ i.e. unknown
+	widthOfWidestLine := nil. "/ i.e. unknown
-self getFontParameters.
+	self getFontParameters.
-realized ifTrue:[
+	realized ifTrue:[
-(font graphicsDevice == device) ifTrue:[
+	    (font graphicsDevice == device) ifTrue:[
-self getFontParameters.
+		self getFontParameters.
-self computeNumberOfLinesShown.
+		self computeNumberOfLinesShown.
-shown ifTrue:[
+		shown ifTrue:[
-self redrawFromVisibleLine:1 to:nLinesShown
+		    self redrawFromVisibleLine:1 to:nLinesShown
-]
+		]
-].
+	    ].
-self contentsChanged
+	    self contentsChanged
-]
+	]
 ]
 "Modified: 5.7.1996 / 17:55:34 / cg"
 !
 fontHeight:pixels
 "set the lines height - thats the number of pixels,
 by which lines are vertically separated."
 fontHeight ~~ pixels ifTrue:[
-fontHeight := pixels.
+	fontHeight := pixels.
 ]
 "Created: 17.4.1997 / 01:41:33 / cg"
 !
 (which avoids many computations later)"
 |newMargin|
 aNumber ~~ level ifTrue:[
-newMargin := aNumber abs.
+	newMargin := aNumber abs.
-textStartLeft := leftMargin + newMargin.
+	textStartLeft := leftMargin + newMargin.
-textStartTop := topMargin + newMargin.
+	textStartTop := topMargin + newMargin.
-innerWidth := width - textStartLeft - newMargin.
+	innerWidth := width - textStartLeft - newMargin.
-super level:aNumber.
+	super level:aNumber.
 ]
 "Modified: 11.8.1997 / 02:59:15 / cg"
 !
 add:aString
 "add a line and redisplay"
 list add:aString.
 includesNonStrings ifFalse:[
-includesNonStrings := (aString notNil and:[aString isString not]).
+	includesNonStrings := (aString notNil and:[aString isString not]).
 "/        includesNonStrings ifTrue:[self getFontParameters].
 ].
 shown ifTrue:[
-self redrawLine:(self size).
+	self redrawLine:(self size).
-self contentsChanged.             "recompute scrollbars"
+	self contentsChanged.             "recompute scrollbars"
 ]
 "Modified: 22.10.1996 / 23:18:47 / cg"
 !
 "add a line and redisplay"
 list isNil ifTrue:[list := OrderedCollection new].
 list add:aString beforeIndex:index.
 includesNonStrings ifFalse:[
-includesNonStrings := (aString notNil and:[aString isString not]).
+	includesNonStrings := (aString notNil and:[aString isString not]).
 "/        includesNonStrings ifTrue:[self getFontParameters].
 ].
 shown ifTrue:[
-self redrawFromLine:index.
+	self redrawFromLine:index.
-self contentsChanged.             "recompute scrollbars"
+	self contentsChanged.             "recompute scrollbars"
 ]
 "Modified: 22.10.1996 / 23:18:53 / cg"
 !
 fontHeightBefore := fontHeight.
 self withoutRedrawAt:index put:aString.
 shown ifTrue:[
-"/ synchronous drawing:
+	"/ synchronous drawing:
-"/ this could have changed the font height;
+	"/ this could have changed the font height;
-"/ must clear all below last line, if it became smaller
+	"/ must clear all below last line, if it became smaller
-fontHeightBefore > fontHeight ifTrue:[
+	fontHeightBefore > fontHeight ifTrue:[
-(self listLineIsVisible:(self size)) ifTrue:[
+	    (self listLineIsVisible:(self size)) ifTrue:[
-self clearRectangle:(margin @ (self yOfVisibleLine:nLinesShown+1))
+		self clearRectangle:(margin @ (self yOfVisibleLine:nLinesShown+1))
-corner:(width-margin) @ (height-margin).
+				    corner:(width-margin) @ (height-margin).
-].
+	    ].
-self redrawFromLine:index
+	    self redrawFromLine:index
-] ifFalse:[
+	] ifFalse:[
-self redrawLine:index
+	    self redrawLine:index
-].
+	].
-"/ asynchronous:
+	"/ asynchronous:
 "/        visibleLine := self listLineToVisibleLine:index.
 "/        visibleLine notNil ifTrue:[
 "/            y := self yOfVisibleLine:visibleLine.
 "/            self invalidate:((margin @ y) extent:(width@fontHeight))
 "/        ].
 |l|
 l := something.
 l notNil ifTrue:[
-l isString ifTrue:[
+	l isString ifTrue:[
-l := l asStringCollection
+	    l := l asStringCollection
-]
+	]
 ].
 self list:l
 "Modified: 5.6.1997 / 11:11:54 / cg"
 !
 If scan is true, scan the passed list for nonStrings; otherwise,
 assume that it does contain non-strings
 (remembered to optimize later redraws)."
 self
-list:aCollection expandTabs:expand scanForNonStrings:scan includesNonStrings:true
+	list:aCollection expandTabs:expand scanForNonStrings:scan includesNonStrings:true
 "Modified: 5.6.1997 / 12:40:35 / cg"
 !
 list:aCollection expandTabs:expand scanForNonStrings:scan includesNonStrings:nonStrings
 (the nonStrings information is remembered to optimize later redraws & height computations)."
 |oldFirst oldLeft nonStringsBefore fontHeightBefore|
 (aCollection isNil and:[list isNil]) ifTrue:[
-"no change"
+	"no change"
-self scrollToTop.
+	self scrollToTop.
-self scrollToLeft.
+	self scrollToLeft.
-^ self
+	^ self
 ].
 list := aCollection.
 nonStringsBefore := includesNonStrings.
 fontHeightBefore := fontHeight.
 includesNonStrings := false.
 list notNil ifTrue:[
-expand ifTrue:[
+	expand ifTrue:[
-self expandTabs
+	    self expandTabs
-] ifFalse:[
+	] ifFalse:[
-scan ifTrue:[
+	    scan ifTrue:[
-includesNonStrings := (list findFirst:[:e | e isString not]) ~~ 0.
+		includesNonStrings := (list findFirst:[:e | e isString not]) ~~ 0.
-] ifFalse:[
+	    ] ifFalse:[
-includesNonStrings := nonStrings
+		includesNonStrings := nonStrings
-]
+	    ]
-].
+	].
 ].
 (includesNonStrings ~~ nonStringsBefore) ifTrue:[
-self getFontParameters.
+	self getFontParameters.
 ].
 widthOfWidestLine := nil.   "/ i.e. unknown
 oldFirst := firstLineShown.
 oldLeft := leftOffset.
 firstLineShown := 1.
 leftOffset := 0.
 realized ifTrue:[
-(includesNonStrings ~~ nonStringsBefore) ifTrue:[
+	(includesNonStrings ~~ nonStringsBefore) ifTrue:[
-self computeNumberOfLinesShown.
+	    self computeNumberOfLinesShown.
-].
+	].
-self contentsChanged.
+	self contentsChanged.
-"
+	"
-dont use scroll here to avoid double redraw
+	 dont use scroll here to avoid double redraw
-"
+	"
-viewOrigin := 0 @ 0.
+	viewOrigin := 0 @ 0.
-oldFirst ~~ firstLineShown ifTrue:[
+	oldFirst ~~ firstLineShown ifTrue:[
-self originChanged:0 @ ((oldFirst - 1) * fontHeight negated).
+	    self originChanged:0 @ ((oldFirst - 1) * fontHeight negated).
-].
+	].
-shown ifTrue:[
+	shown ifTrue:[
-self redrawFromVisibleLine:1 to:nLinesShown.
+	    self redrawFromVisibleLine:1 to:nLinesShown.
-fontHeightBefore > fontHeight ifTrue:[
+	    fontHeightBefore > fontHeight ifTrue:[
-(self listLineIsVisible:(self size)) ifTrue:[
+		(self listLineIsVisible:(self size)) ifTrue:[
 "/                    self clearRectangle:((margin @ (self yOfVisibleLine:nLinesShown+1))
 "/                                        corner:(width-margin) @ (height-margin)).
-].
+		].
-]
+	    ]
-]
+	]
 ]
 "Modified: / 30.8.1995 / 19:07:13 / claus"
 "Created: / 5.6.1997 / 12:40:06 / cg"
 "Modified: / 26.7.1998 / 13:47:35 / cg"
 is there a need to redraw ?
 "
 shown ifFalse:[^ self].
 visLine := self listLineToVisibleLine:lineNr.
 visLine notNil ifTrue:[
-w := self widthForScrollBetween:lineNr and:(firstLineShown + nLinesShown).
+	w := self widthForScrollBetween:lineNr and:(firstLineShown + nLinesShown).
 "/        x := textStartLeft.
 "/ CLAUS fixes leftOver selection pixels
-w := w + leftMargin.
+	w := w + leftMargin.
-x := margin.
+	x := margin.
-srcY := topMargin + (visLine * fontHeight).
+	srcY := topMargin + (visLine * fontHeight).
 "/        h := ((nLinesShown - visLine) * fontHeight).
-h := (height - margin - srcY).
+	h := (height - margin - srcY).
-h > 0 ifTrue:[
+	h > 0 ifTrue:[
-self catchExpose.
+	    self catchExpose.
-self
+	    self
-copyFrom:self
+		copyFrom:self
-x:x y:srcY
+		x:x y:srcY
-toX:x y:(srcY - fontHeight)
+		toX:x y:(srcY - fontHeight)
-width:w height:h
+		width:w height:h
-async:true.
+		async:true.
-].
+	].
-self redrawVisibleLine:nFullLinesShown.
+	self redrawVisibleLine:nFullLinesShown.
-"
+	"
-redraw last partial line - if any
+	 redraw last partial line - if any
-"
+	"
-(nFullLinesShown ~~ nLinesShown) ifTrue:[
+	(nFullLinesShown ~~ nLinesShown) ifTrue:[
-self redrawVisibleLine:nLinesShown
+	    self redrawVisibleLine:nLinesShown
-].
+	].
-h > 0 ifTrue:[
+	h > 0 ifTrue:[
-self waitForExpose
+	    self waitForExpose
-].
+	].
 ]
 "Modified: / 27.2.1998 / 12:36:59 / cg"
 !
 (for example: a file list being shown, without disturbing the user too much)"
 |oldFirst nonStringsBefore linesShownBefore|
 (aCollection isNil and:[list isNil]) ifTrue:[
-"no change"
+	"no change"
-^ self
+	^ self
 ].
 "/    list isNil ifTrue:[
 "/        linesShownBefore := (1 to:nLinesShown) collect:[:i | ''].
 "/    ] ifFalse:[
 nonStringsBefore := includesNonStrings.
 includesNonStrings := false.
 list notNil ifTrue:[
-expandTabs ifTrue:[
+	expandTabs ifTrue:[
-self expandTabs
+	    self expandTabs
-] ifFalse:[
+	] ifFalse:[
-includesNonStrings := (list findFirst:[:e | e isString not]) ~~ 0.
+	    includesNonStrings := (list findFirst:[:e | e isString not]) ~~ 0.
-].
+	].
 ].
 (includesNonStrings ~~ nonStringsBefore) ifTrue:[
-self getFontParameters.
+	self getFontParameters.
-self computeNumberOfLinesShown.
+	self computeNumberOfLinesShown.
 ].
 "/ new - reposition horizontally if too big
 widthOfWidestLine := nil.   "/ i.e. unknown
 innerWidth >= self widthOfContents ifTrue:[
-viewOrigin x:0.
+	viewOrigin x:0.
-leftOffset := 0.
+	leftOffset := 0.
 ].
 self contentsChanged.
 "/ new - reposition vertically if too big
 (firstLineShown + nFullLinesShown) > self size ifTrue:[
-oldFirst := firstLineShown.
+	oldFirst := firstLineShown.
-firstLineShown := self size - nFullLinesShown + 1.
+	firstLineShown := self size - nFullLinesShown + 1.
-firstLineShown < 1 ifTrue:[firstLineShown := 1].
+	firstLineShown < 1 ifTrue:[firstLineShown := 1].
-viewOrigin y:(firstLineShown - 1 * fontHeight).
+	viewOrigin y:(firstLineShown - 1 * fontHeight).
-self originChanged:0 @ ((oldFirst - 1) negated * fontHeight).
+	self originChanged:0 @ ((oldFirst - 1) negated * fontHeight).
-linesShownBefore := nil.
+	linesShownBefore := nil.
-shown ifTrue:[
+	shown ifTrue:[
-self clear.
+	    self clear.
-]
+	]
 ].
 "/ end new
 (shown and:[doRedraw]) ifTrue:[
-self redrawFromVisibleLine:1 to:nLinesShown
+	  self redrawFromVisibleLine:1 to:nLinesShown
 "/        linesShownBefore isNil ifTrue:[
 "/            self redrawFromVisibleLine:1 to:nLinesShown
 "/        ] ifFalse:[
 "/            1 to:nLinesShown do:[:l |
 |line len s|
 len := col2 - col1 + 1.
 list notNil ifTrue:[
-line := self listAt:lineNr.
+	line := self listAt:lineNr.
-line notNil ifTrue:[
+	line notNil ifTrue:[
-(line size >= col1) ifTrue:[
+	    (line size >= col1) ifTrue:[
-s := line copyFrom:col1.
+		s := line copyFrom:col1.
-s size < len ifTrue:[
+		s size < len ifTrue:[
-^ s paddedTo:len
+		    ^ s paddedTo:len
-].
+		].
-^ s copyTo:len
+		^ s copyTo:len
-]
+	    ]
-]
+	]
 ].
 ^ String new:len withAll:Character space
 "Created: 7.1.1997 / 19:58:43 / cg"
 !
 self checkForExistingLine:index.
 list at:index put:aString.
 didIncludeNonStrings := includesNonStrings.
 includesNonStrings ifFalse:[
-includesNonStrings := (aString notNil and:[aString isString not]).
+	includesNonStrings := (aString notNil and:[aString isString not]).
 ] ifTrue:[
-(aString isNil or:[aString isString]) ifTrue:[
+	(aString isNil or:[aString isString]) ifTrue:[
-includesNonStrings := (list findFirst:[:l | l notNil and:[l isString not]]) ~~ 0.
+	    includesNonStrings := (list findFirst:[:l | l notNil and:[l isString not]]) ~~ 0.
-]
+	]
 ].
 includesNonStrings ~~ didIncludeNonStrings ifTrue:[
-self getFontParameters.
+	self getFontParameters.
-self computeNumberOfLinesShown
+	self computeNumberOfLinesShown
 ].
 widthOfWidestLine notNil ifTrue:[
-aString isString ifTrue:[
+	aString isString ifTrue:[
-w := font widthOf:aString
+	    w := font widthOf:aString
-] ifFalse:[
+	] ifFalse:[
-w := aString widthOn:self
+	    w := aString widthOn:self
-].
+	].
-w > widthOfWidestLine ifTrue:[
+	w > widthOfWidestLine ifTrue:[
-widthOfWidestLine := w
+	    widthOfWidestLine := w
-] ifFalse:[
+	] ifFalse:[
-widthOfWidestLine := nil "/ means: unknown
+	    widthOfWidestLine := nil "/ means: unknown
-].
+	].
 ]
 "Modified: / 26.7.1998 / 13:00:14 / cg"
 ! !
 on:aModel aspect:aspectSymbol change:changeSymbol list:listSymbol menu:menuSymbol
 "ST-80 compatibility"
 aspectSymbol notNil ifTrue:[aspectMsg := aspectSymbol.
-listMsg isNil ifTrue:[listMsg := aspectSymbol]].
+			     listMsg isNil ifTrue:[listMsg := aspectSymbol]].
 listSymbol notNil ifTrue:[listMsg := listSymbol].
 changeSymbol notNil ifTrue:[changeMsg := changeSymbol].
 menuMsg := menuSymbol.
 self model:aModel.
 !ListView methodsFor:'change and update '!
 update:something with:aParameter from:changedObject
 changedObject == model ifTrue:[
-(aspectMsg notNil
+	(aspectMsg notNil
-and:[something == aspectMsg]) ifTrue:[
+	and:[something == aspectMsg]) ifTrue:[
-^ self getListFromModel.
+	    ^ self getListFromModel.
-].
+	].
-something == #size ifTrue:[
+	something == #size ifTrue:[
-^ self getListFromModelScroll:false.
+	    ^ self getListFromModelScroll:false.
-]
+	]
 ].
 ^ super update:something with:aParameter from:changedObject
 "Modified: 5.3.1997 / 16:14:01 / cg"
 ! !
 self paint:bg.
 (lineString notNil and:[lineString isString not])
 ifTrue:[
-self drawVisibleLine:visLineNr with:fg and:bg
+	self drawVisibleLine:visLineNr with:fg and:bg
 ] ifFalse:[
-yf := y - (lineSpacing // 2).
+	yf := y - (lineSpacing // 2).
-col > lineString size ifTrue:[
+	col > lineString size ifTrue:[
-self fillRectangleX:x y:yf width:(font width) height:fontHeight.
+	    self fillRectangleX:x y:yf width:(font width) height:fontHeight.
-self paint:fg
+	    self paint:fg
-] ifFalse:[
+	] ifFalse:[
-characterString := lineString copyFrom:col to:col.
+	    characterString := lineString copyFrom:col to:col.
 "/            (em := characterString emphasis) notNil ifTrue:[
 "/                em := em at:1.
 "/                (Text emphasis:em includes:#italic) ifTrue:[
 "/                    self paint:fg on:bg.
 "/                    self displayOpaqueString:characterString x:x y:(y + fontAscent).
 "/                    ^ self
 "/                ]
 "/            ].
-self fillRectangleX:x y:yf
+	    self fillRectangleX:x y:yf
-width:(font widthOf:characterString)
+			  width:(font widthOf:characterString)
-height:fontHeight.
+			 height:fontHeight.
-self paint:fg.
+	    self paint:fg.
-self displayString:characterString x:x y:(y + fontAscent)
+	    self displayString:characterString x:x y:(y + fontAscent)
-]
+	]
 ]
 "Modified: / 22.4.1998 / 09:13:32 / cg"
 !
 "draw part of a visible line in fg/bg"
 |y yf x lineString len characterString w sCol|
 (endCol >= startCol) ifTrue:[
-sCol := startCol max:1.
+	sCol := startCol max:1.
-lineString := self visibleAt:visLineNr.
+	lineString := self visibleAt:visLineNr.
-(lineString notNil and:[lineString isString not])
+	(lineString notNil and:[lineString isString not])
-ifTrue:[
+	ifTrue:[
-self drawVisibleLine:visLineNr with:fg and:bg.
+	    self drawVisibleLine:visLineNr with:fg and:bg.
-] ifFalse:[
+	] ifFalse:[
-x := (self xOfCol:sCol inVisibleLine:visLineNr) - leftOffset.
+	    x := (self xOfCol:sCol inVisibleLine:visLineNr) - leftOffset.
-y := (self yOfVisibleLine:visLineNr).
+	    y := (self yOfVisibleLine:visLineNr).
-yf := y - (lineSpacing // 2).
+	    yf := y - (lineSpacing // 2).
-len := lineString size.
+	    len := lineString size.
-(sCol > len) ifTrue:[
+	    (sCol > len) ifTrue:[
-len := endCol - sCol + 1.
+		len := endCol - sCol + 1.
-self paint:bg.
+		self paint:bg.
-self fillRectangleX:x y:yf
+		self fillRectangleX:x y:yf
-width:(fontWidth * len)
+			      width:(fontWidth * len)
-height:fontHeight
+			     height:fontHeight
-] ifFalse:[
+	    ] ifFalse:[
-(endCol > len) ifTrue:[
+		(endCol > len) ifTrue:[
-characterString := lineString species new:endCol.
+		    characterString := lineString species new:endCol.
-characterString replaceFrom:1 to:len with:lineString startingAt:1.
+		    characterString replaceFrom:1 to:len with:lineString startingAt:1.
-lineString := characterString
+		    lineString := characterString
-].
+		].
-self paint:bg.
+		self paint:bg.
-(lineString isMemberOf:String) ifTrue:[
+		(lineString isMemberOf:String) ifTrue:[
-fontIsFixedWidth ifTrue:[
+		    fontIsFixedWidth ifTrue:[
-w := (endCol - sCol + 1) * fontWidth
+			w := (endCol - sCol + 1) * fontWidth
-] ifFalse:[
+		    ] ifFalse:[
-w := font widthOf:lineString from:sCol to:endCol
+			w := font widthOf:lineString from:sCol to:endCol
-]
+		    ]
-] ifFalse:[
+		] ifFalse:[
-w := (lineString copyFrom:sCol to:endCol) widthOn:self
+		    w := (lineString copyFrom:sCol to:endCol) widthOn:self
-].
+		].
-self fillRectangleX:x y:yf
+		self fillRectangleX:x y:yf
-width:w
+			      width:w
-height:fontHeight.
+			      height:fontHeight.
-self paint:fg on:bg.
+		self paint:fg on:bg.
-self displayOpaqueString:lineString from:sCol to:endCol x:x y:(y + fontAscent)
+		self displayOpaqueString:lineString from:sCol to:endCol x:x y:(y + fontAscent)
-]
+	    ]
-]
+	]
 ]
 "Modified: / 3.9.1998 / 21:54:01 / cg"
 !
 fillRectangleX:x y:y width:w height:h
 "fill rectangle; checks whether the rectangle already is filled with
 the current paint (#redrawX:y:w:h).
 "
 backgroundAlreadyClearedColor ~~ paint ifTrue:[
-super fillRectangleX:x y:y width:w height:h
+	super fillRectangleX:x y:y width:w height:h
 ]
 !
 |yTop visLineNr|
 visLineNr := self listLineToVisibleLine:line.
 visLineNr notNil ifTrue:[
-yTop := self yOfVisibleLine:visLineNr.
+	yTop := self yOfVisibleLine:visLineNr.
-yTop isNil ifTrue:[^ self]. "/ not visible
+	yTop isNil ifTrue:[^ self]. "/ not visible
-(yTop + fontHeight) < 0 ifTrue:[^ self]. "/ not visible
+	(yTop + fontHeight) < 0 ifTrue:[^ self]. "/ not visible
-self invalidate:(Rectangle
+	self invalidate:(Rectangle
-left:margin top:yTop
+			    left:margin top:yTop
-width:(width - (2 * margin)) height:fontHeight).
+			    width:(width - (2 * margin)) height:fontHeight).
 ]
 "Created: / 5.3.1998 / 01:24:19 / cg"
 "Modified: / 5.3.1998 / 13:41:31 / cg"
 ! !
 "contents changed - move origin up if possible"
 |listSize newOrigin|
 shown ifTrue:[
-list notNil ifTrue:[
+	list notNil ifTrue:[
-listSize := self numberOfLines.
+	    listSize := self numberOfLines.
-listSize == 0 ifTrue:[
+	    listSize == 0 ifTrue:[
-widthOfWidestLine := 0.
+		widthOfWidestLine := 0.
-].
+	    ].
-"
+	    "
-if we are beyond the end, scroll up a bit
+	     if we are beyond the end, scroll up a bit
-"
+	    "
-((firstLineShown + nFullLinesShown) > listSize) ifTrue:[
+	    ((firstLineShown + nFullLinesShown) > listSize) ifTrue:[
-newOrigin := listSize - nFullLinesShown + 1.
+		newOrigin := listSize - nFullLinesShown + 1.
-newOrigin < 1 ifTrue:[
+		newOrigin < 1 ifTrue:[
-newOrigin := 1
+		    newOrigin := 1
-].
+		].
-self scrollToLine: newOrigin.
+		self scrollToLine: newOrigin.
-].
+	    ].
-].
+	].
 ].
 ^ super contentsChanged
 "Modified: 18.11.1996 / 19:50:07 / stefan"
 self paint:bgColor.
 self fillRectangleX:x y:y width:w height:h.
 backgroundAlreadyClearedColor := bgColor.
 (includesNonStrings or:[w > (width // 4 * 3)]) ifTrue:[
-"includes non strings or area is big enough redraw whole lines"
+	"includes non strings or area is big enough redraw whole lines"
-self redrawFromVisibleLine:startLine to:stopLine
+	self redrawFromVisibleLine:startLine to:stopLine
 ] ifFalse:[
-line := self visibleAt:startLine.
+	line := self visibleAt:startLine.
-(fontIsFixedWidth and:[line isMemberOf:String]) ifFalse:[
+	(fontIsFixedWidth and:[line isMemberOf:String]) ifFalse:[
-"start/end col has to be computed for each line"
+	    "start/end col has to be computed for each line"
-startLine to:stopLine do:[:i |
+	    startLine to:stopLine do:[:i |
-startCol := self colOfX:x inVisibleLine:i.
+		startCol := self colOfX:x inVisibleLine:i.
-endCol := self colOfX:(x + w) inVisibleLine:i.
+		endCol := self colOfX:(x + w) inVisibleLine:i.
-startCol > 0 ifTrue:[
+		startCol > 0 ifTrue:[
-endCol > 0 ifTrue:[
+		    endCol > 0 ifTrue:[
-self redrawVisibleLine:i from:startCol to:endCol
+			self redrawVisibleLine:i from:startCol to:endCol
-]
+		    ]
-]
+		]
-]
+	    ]
-] ifTrue:[
+	] ifTrue:[
-"start/end col is the same for all lines"
+	    "start/end col is the same for all lines"
-startCol := self colOfX:x inVisibleLine:startLine.
+	    startCol := self colOfX:x inVisibleLine:startLine.
-endCol := self colOfX:(x + w) inVisibleLine:startLine.
+	    endCol := self colOfX:(x + w) inVisibleLine:startLine.
-startCol > 0 ifTrue:[
+	    startCol > 0 ifTrue:[
-endCol > 0 ifTrue:[
+		endCol > 0 ifTrue:[
-startLine to:stopLine do:[:i |
+		    startLine to:stopLine do:[:i |
-line := self visibleAt:i.
+			line := self visibleAt:i.
-(line isMemberOf:String) ifTrue:[
+			(line isMemberOf:String) ifTrue:[
-self redrawVisibleLine:i from:startCol to:endCol
+			    self redrawVisibleLine:i from:startCol to:endCol
-] ifFalse:[
+			] ifFalse:[
-self redrawVisibleLine:i
+			    self redrawVisibleLine:i
-]
+			]
-]
+		    ]
-]
+		]
-]
+	    ]
-]
+	]
 ].
 backgroundAlreadyClearedColor := nil.
 self clippingRectangle:saveClip.
 !
 sizeChanged:how
 "size changed - move origin up if possible"
 listSize := self numberOfLines.
 "
 if we are beyond the end, scroll up a bit
 "
 ((firstLineShown + nFullLinesShown) > listSize) ifTrue:[
-newOrigin := listSize - nFullLinesShown + 1.
+	newOrigin := listSize - nFullLinesShown + 1.
-newOrigin < 1 ifTrue:[
+	newOrigin < 1 ifTrue:[
-newOrigin := 1
+	    newOrigin := 1
-].
+	].
-self scrollToLine: newOrigin.
+	self scrollToLine: newOrigin.
-^ self
+	^ self
 ].
 "Modified: / 18.11.1996 / 19:37:02 / stefan"
 "Modified: / 27.1.1998 / 14:10:04 / cg"
 ! !
 !
 initStyle
 "setup viewStyle specifics"
+|n|
 super initStyle.
 "/    DefaultFont notNil ifTrue:[font := DefaultFont on:device]
-self topMargin:(self verticalPixelPerMillimeter:0.5) rounded.
+n := DefaultTopMargin.
-self leftMargin:(self horizontalPixelPerMillimeter:0.5) rounded.
+n isInteger ifFalse:[
+	n := (self verticalPixelPerMillimeter:n) rounded.
+].
+self topMargin:n.
+n := DefaultLeftMargin.
+n isInteger ifFalse:[
+	n := (self verticalPixelPerMillimeter:n) rounded.
+].
+self leftMargin:n.
 lineSpacing := 0.
 fgColor := DefaultForegroundColor.
 bgColor := DefaultBackgroundColor.
-"Modified: 22.1.1997 / 11:57:21 / cg"
 !
 initialize
 super initialize.
 realize
 |sz|
 extentChanged ifTrue:[
-self computeNumberOfLinesShown.
+	self computeNumberOfLinesShown.
 ].
 firstLineShown ~~ 1 ifTrue:[
-sz := self size.
+	sz := self size.
-firstLineShown + nLinesShown > sz ifTrue:[
+	firstLineShown + nLinesShown > sz ifTrue:[
-self scrollToLine:sz - nLinesShown.
+	    self scrollToLine:sz - nLinesShown.
-]
+	]
 ].
 super realize.
 "/ old: fetch models value on realize;
 "Modified: 28.2.1997 / 19:44:19 / cg"
 !
 recreate
 "recreate after a snapin"
+|n|
 super recreate.
 "
 recompute margins and font parameters
 - display may have different resolution/font sizes.
 "
-topMargin := (self verticalPixelPerMillimeter:0.5) rounded.
+"/    topMargin := (self verticalPixelPerMillimeter:0.5) rounded.
-self leftMargin:(self horizontalPixelPerMillimeter:0.5) rounded.
+"/    self leftMargin:(self horizontalPixelPerMillimeter:0.5) rounded.
+n := DefaultTopMargin.
+n isInteger ifFalse:[
+	n := (self verticalPixelPerMillimeter:n) rounded.
+].
+self topMargin:n.
+n := DefaultLeftMargin.
+n isInteger ifFalse:[
+	n := (self verticalPixelPerMillimeter:n) rounded.
+].
+self leftMargin:n.
 self getFontParameters
+"Modified: / 26.9.1998 / 17:09:32 / cg"
 ! !
 !ListView methodsFor:'private'!
 absoluteLineToVisibleLine:absLineNr
 "
 for fix fonts, this is easy ...
 "
 (fontIsFixedWidth
 and:[lineString isNil
-or:[lineString isMemberOf:String]]) ifTrue:[
+	 or:[lineString isMemberOf:String]]) ifTrue:[
-^ (xRel // fontWidth) + 1
+	^ (xRel // fontWidth) + 1
 ].
 "
 for variable fonts, more work is required ...
 "
 lineString notNil ifTrue:[
-lineString := lineString asString.
+	lineString := lineString asString.
-(hasEmphasis := lineString hasChangeOfEmphasis) ifTrue:[
+	(hasEmphasis := lineString hasChangeOfEmphasis) ifTrue:[
-linePixelWidth := lineString widthOn:self
+	    linePixelWidth := lineString widthOn:self
-] ifFalse:[
+	] ifFalse:[
-lineString := lineString string.
+	    lineString := lineString string.
-linePixelWidth := font widthOf:lineString.
+	    linePixelWidth := font widthOf:lineString.
-]
+	]
 ] ifFalse:[
-linePixelWidth := 0
+	linePixelWidth := 0
 ].
 (linePixelWidth <= xRel) ifTrue:[
-fontWidth == 0 ifTrue:[
+	fontWidth == 0 ifTrue:[
-"
+	    "
-although this 'cannot happen',
+	     although this 'cannot happen',
-it seems that X reports this width for some strange fonts ...
+	     it seems that X reports this width for some strange fonts ...
-"
+	    "
-^ lineString size
+	    ^ lineString size
-].
+	].
-^ lineString size + ((xRel - linePixelWidth) // fontWidth) + 1
+	^ lineString size + ((xRel - linePixelWidth) // fontWidth) + 1
 ].
 "/ cannot simply count individual characters,
 "/ since kerning or other non-linear effects may be involved ...
 runCol := lineString size // 2.
 (runCol == 0) ifTrue:[runCol := 1].
 hasEmphasis ifTrue:[
-posLeft := (lineString copyFrom:1 to:(runCol - 1)) widthOn:self.
+	posLeft := (lineString copyFrom:1 to:(runCol - 1)) widthOn:self.
-posRight := (lineString copyFrom:1 to:runCol) widthOn:self.
+	posRight := (lineString copyFrom:1 to:runCol) widthOn:self.
 ] ifFalse:[
-posLeft := font widthOf:lineString from:1 to:(runCol - 1).
+	posLeft := font widthOf:lineString from:1 to:(runCol - 1).
-posRight := font widthOf:lineString from:1 to:runCol.
+	posRight := font widthOf:lineString from:1 to:runCol.
 ].
 done := (posLeft <= xRel) and:[posRight > xRel].
 [done] whileFalse:[
-oPosRight := posRight.
+	oPosRight := posRight.
-oPosLeft := posLeft.
+	oPosLeft := posLeft.
-(posRight <= xRel) ifTrue:[
+	(posRight <= xRel) ifTrue:[
-runCol := runCol + 1.
+	    runCol := runCol + 1.
-posLeft := posRight.
+	    posLeft := posRight.
-hasEmphasis ifTrue:[
+	    hasEmphasis ifTrue:[
-posRight := (lineString copyFrom:1 to:runCol) widthOn:self.
+		posRight := (lineString copyFrom:1 to:runCol) widthOn:self.
-] ifFalse:[
+	    ] ifFalse:[
-posRight := font widthOf:lineString from:1 to:runCol
+		posRight := font widthOf:lineString from:1 to:runCol
-]
+	    ]
-] ifFalse:[
+	] ifFalse:[
-(posLeft > xRel) ifTrue:[
+	    (posLeft > xRel) ifTrue:[
-runCol := runCol - 1.
+		runCol := runCol - 1.
-(runCol == 0) ifTrue:[^ 0].
+		(runCol == 0) ifTrue:[^ 0].
-posRight := posLeft.
+		posRight := posLeft.
-hasEmphasis ifTrue:[
+		hasEmphasis ifTrue:[
-posLeft := (lineString copyFrom:1 to:(runCol - 1)) widthOn:self.
+		    posLeft := (lineString copyFrom:1 to:(runCol - 1)) widthOn:self.
-] ifFalse:[
+		] ifFalse:[
-posLeft := font widthOf:lineString from:1 to:(runCol - 1)
+		    posLeft := font widthOf:lineString from:1 to:(runCol - 1)
-]
+		]
-]
+	    ]
-].
+	].
-done := (posLeft <= xRel) and:[posRight > xRel].
+	done := (posLeft <= xRel) and:[posRight > xRel].
-((oPosRight == posRight) and:[oPosLeft == posLeft]) ifTrue:[
+	((oPosRight == posRight) and:[oPosLeft == posLeft]) ifTrue:[
-"/ paranoia: just in case there are unprintable characters
+	    "/ paranoia: just in case there are unprintable characters
-"/ (avoid endless loop if the binary search does not make progress)
+	    "/ (avoid endless loop if the binary search does not make progress)
-done := true.
+	    done := true.
-]
+	 ]
 ].
 ^ runCol
 "Modified: / 3.9.1998 / 21:55:41 / cg"
 font := font on:device.
 hMax := font height.
 includesNonStrings == true ifTrue:[
-"/
+	"/
-"/ find maximum height of lines
+	"/ find maximum height of lines
-"/
+	"/
-hMax := list inject:hMax into:[:maxSoFar :thisLine |
+	hMax := list inject:hMax into:[:maxSoFar :thisLine |
-thisLine isNil ifTrue:[
+					thisLine isNil ifTrue:[
-maxSoFar
+					    maxSoFar
-] ifFalse:[
+					] ifFalse:[
-(thisLine isMemberOf:String) ifTrue:[
+					    (thisLine isMemberOf:String) ifTrue:[
-maxSoFar
+						maxSoFar
-] ifFalse:[
+					    ] ifFalse:[
-maxSoFar max:(thisLine heightOn:self)
+						maxSoFar max:(thisLine heightOn:self)
-]
+					    ]
-]
+					]
-].
+			      ].
 ].
 fontHeight := hMax + lineSpacing.
 fontAscent := font ascent. "/ maxAscent.
 fontWidth := font width.
 If there is no listMessage, try aspect for backward compatibility."
 |text msg|
 model notNil ifTrue:[
-msg := listMsg.
+	msg := listMsg.
-msg isNil ifTrue:[
+	msg isNil ifTrue:[
-msg := aspectMsg
+	    msg := aspectMsg
-].
+	].
-msg notNil ifTrue:[
+	msg notNil ifTrue:[
-text := model perform:msg.
+	    text := model perform:msg.
-text notNil ifTrue:[
+	    text notNil ifTrue:[
-text := text asStringCollection.
+		text := text asStringCollection.
-].
+	    ].
 "/ SV: this does not work, if model uses (i.e. updates) the same stringCollection
 "/ as the view!!
 "/            text ~= list ifTrue:[
-self list:text
+		self list:text
 "/            ].
-].
+	].
 ].
 "Modified: 26.4.1996 / 14:09:42 / cg"
 "Modified: 19.2.1997 / 12:08:50 / stefan"
 !
 If there is no listMessage, try aspect for backward compatibility."
 |text msg|
 model notNil ifTrue:[
-msg := listMsg.
+	msg := listMsg.
-msg isNil ifTrue:[
+	msg isNil ifTrue:[
-msg := aspectMsg
+	    msg := aspectMsg
-].
+	].
-msg notNil ifTrue:[
+	msg notNil ifTrue:[
-text := model perform:msg.
+	    text := model perform:msg.
-text notNil ifTrue:[
+	    text notNil ifTrue:[
-text := text asStringCollection.
+		text := text asStringCollection.
-].
+	    ].
 "/ SV: this does not work, if model uses (i.e. updates) the same stringCollection
 "/ as the view!!
 "/            text ~= list ifTrue:[
-aBoolean ifTrue:[
+		aBoolean ifTrue:[
-self list:text
+		    self list:text
-] ifFalse:[
+		] ifFalse:[
-self setList:text
+		    self setList:text
-]
+		]
 "/            ].
-].
+	].
 ].
 "Modified: 19.2.1997 / 12:08:50 / stefan"
 "Created: 5.3.1997 / 16:10:22 / cg"
 "Modified: 5.3.1997 / 16:14:44 / cg"
 lineNr := 1.
 sum := 0.
 lastLine := self size.
 [(sum < charPos) and:[lineNr <= lastLine]] whileTrue:[
-sum := sum + (self at:lineNr) size + 1.
+	sum := sum + (self at:lineNr) size + 1.
-lineNr := lineNr + 1
+	lineNr := lineNr + 1
 ].
 sum == charPos ifTrue:[
-^ lineNr
+	^ lineNr
 ].
 ^ lineNr - 1
 "Modified: / 5.4.1998 / 17:19:28 / cg"
 tcol := col - 1.
 line := self visibleAt:visLineNr.
 (fontIsFixedWidth
 and:[line isNil
-or:[line isMemberOf:String]]) ifTrue:[
+	 or:[line isMemberOf:String]]) ifTrue:[
-^ (tcol * fontWidth) + textStartLeft
+	^ (tcol * fontWidth) + textStartLeft
 ].
 line notNil ifTrue:[
-lineSize := line size
+	lineSize := line size
 ] ifFalse:[
-lineSize := 0
+	lineSize := 0
 ].
 (lineSize == 0) ifTrue:[
-^ (tcol * fontWidth) + textStartLeft
+	^ (tcol * fontWidth) + textStartLeft
 ].
 (lineSize < col) ifTrue:[
-^ (line widthOn:self)
+	^ (line widthOn:self)
-+ (fontWidth * (tcol - lineSize))
+	  + (fontWidth * (tcol - lineSize))
-+ textStartLeft
+	  + textStartLeft
 ].
 (line isMemberOf:String) ifTrue:[
-^ (font widthOf:line from:1 to:tcol) + textStartLeft
+	^ (font widthOf:line from:1 to:tcol) + textStartLeft
 ].
 ^ ((line copyTo:tcol) widthOn:self) + textStartLeft
 "Modified: / 3.9.1998 / 21:56:33 / cg"
 !
 "/        ].
 "/        ^ self
 "/    ].
 (self needScrollToMakeLine:aListLineNr) ifFalse:[
-^ self
+	^ self
 ].
 (aListLineNr < nFullLinesShown) ifTrue:[
-"/ at the very top of the list - show from top
+	"/ at the very top of the list - show from top
-newTopLine := 1
+	newTopLine := 1
 ] ifFalse:[
-(nFullLinesShown < 3) ifTrue:[
+	(nFullLinesShown < 3) ifTrue:[
-"/ a small view - show from that line
+	    "/ a small view - show from that line
-newTopLine := aListLineNr
+	    newTopLine := aListLineNr
-] ifFalse:[
+	] ifFalse:[
-bott := self numberOfLines - (nFullLinesShown - 1).
+	    bott := self numberOfLines - (nFullLinesShown - 1).
-(aListLineNr > bott) ifTrue:[
+	    (aListLineNr > bott) ifTrue:[
-"/ at the end of the list - show the bottom of the list
+		"/ at the end of the list - show the bottom of the list
-newTopLine := bott
+		newTopLine := bott
-] ifFalse:[
+	    ] ifFalse:[
-"/ somewhere else - place selected line into the middle of
+		"/ somewhere else - place selected line into the middle of
-"/ the view
+		"/ the view
-newTopLine := (aListLineNr - (nFullLinesShown // 2) + 1)
+		newTopLine := (aListLineNr - (nFullLinesShown // 2) + 1)
-]
+	    ]
-]
+	]
 ].
 self scrollToLine:newTopLine.
 "Modified: / 18.12.1996 / 17:48:22 / stefan"
 line containing someString visible."
 |line index list|
 (list := self list) notNil ifTrue:[
-index := list indexOf:someString.
+	index := list indexOf:someString.
-index ~~ 0 ifTrue:[
+	index ~~ 0 ifTrue:[
-self makeLineVisible:index
+	    self makeLineVisible:index
-]
+	]
 ]
 "Modified: 9.9.1997 / 10:10:13 / cg"
 !
 needScrollToMakeLine:aListLineNr
 "return true, if a scroll is needd to make a line visible.
 Numbering starts with 1 for the very first line of the text."
 (aListLineNr >= firstLineShown) ifTrue:[
-(aListLineNr < (firstLineShown + nFullLinesShown)) ifTrue:[
+	(aListLineNr < (firstLineShown + nFullLinesShown)) ifTrue:[
-^ false
+	    ^ false
-]
+	]
 ].
 ^ true
 "Created: / 7.8.1998 / 15:13:51 / cg"
 "Modified: / 7.8.1998 / 15:14:44 / cg"
 scrollDown:nLines
 "change origin to scroll down some lines (towards the bottom of the text)"
 nLines > 0 ifTrue:[
-self scrollTo:(viewOrigin + (0 @ (fontHeight * nLines)))
+	self scrollTo:(viewOrigin + (0 @ (fontHeight * nLines)))
-redraw:true
+	       redraw:true
 ]
 !
 "change origin to scroll down some pixels
 (towards the bottom of the text)
 THIS WILL VANISH!!"
 pix > 0 ifTrue:[
-self scrollTo:(viewOrigin + (0 @ (pix abs))) redraw:true
+	self scrollTo:(viewOrigin + (0 @ (pix abs))) redraw:true
 ]
 !
 scrollLeft:nPixel
 "change origin to scroll left some cols"
 nPixel > 0 ifTrue:[
-self scrollTo:(viewOrigin - (nPixel @ 0)) redraw:true
+	self scrollTo:(viewOrigin - (nPixel @ 0)) redraw:true
 ]
 !
 scrollRight:nPixel
 "change origin to scroll right some cols"
 nPixel > 0 ifTrue:[
-self scrollTo:(viewOrigin + (nPixel @ 0)) redraw:true
+	self scrollTo:(viewOrigin + (nPixel @ 0)) redraw:true
 ]
 !
 scrollUp:nLines
 "change origin to scroll up some lines (towards the top of the text)"
 nLines > 0 ifTrue:[
-self scrollTo:(viewOrigin - (0 @ (fontHeight * nLines)))
+	self scrollTo:(viewOrigin - (0 @ (fontHeight * nLines)))
-redraw:true
+	       redraw:true
 ]
 !
 "change origin to scroll up some pixels
 (towards the top of the text)
 THIS WILL VANISH!!"
 pix > 0 ifTrue:[
-self scrollTo:(viewOrigin - (0 @ pix)) redraw:true
+	self scrollTo:(viewOrigin - (0 @ pix)) redraw:true
 ]
 !
 dltOrg := anOrigin - viewOrigin.
 "/  compute valid horizontal offset x
 (x := dltOrg x) ~~ 0 ifTrue:[
-tmp := leftOffset + x.
+	tmp := leftOffset + x.
-x < 0 ifTrue:[                                          "/ scrolling left
+	x < 0 ifTrue:[                                          "/ scrolling left
-tmp < 0 ifTrue:[x := 1 - leftOffset]
+	    tmp < 0 ifTrue:[x := 1 - leftOffset]
-] ifFalse:[                                             "/ scrolling right
+	] ifFalse:[                                             "/ scrolling right
-"/ allows scrolling to the right of widest line
+	 "/ allows scrolling to the right of widest line
-max := self widthOfContents + 10.
+	    max := self widthOfContents + 10.
-tmp + width > max ifTrue:[
+	    tmp + width > max ifTrue:[
-x := (max - leftOffset - width) max:0
+		x := (max - leftOffset - width) max:0
-]
+	    ]
-]
+	]
 ].
 "/  compute valid vertical offset measured in lines
 (y := dltOrg y // fontHeight) ~~ 0 ifTrue:[
-tmp := firstLineShown + y.
+	tmp := firstLineShown + y.
-y < 0 ifTrue:[                                          "/ scrolling up
+	y < 0 ifTrue:[                                          "/ scrolling up
-tmp < 1 ifTrue:[y := 1 - firstLineShown]
+	    tmp < 1 ifTrue:[y := 1 - firstLineShown]
-] ifFalse:[                                             "/ scrolling down
+	] ifFalse:[                                             "/ scrolling down
-max := self size.
+	    max := self size.
-tmp + nFullLinesShown > max ifTrue:[
+	    tmp + nFullLinesShown > max ifTrue:[
-y := (max - firstLineShown - nFullLinesShown + 1) max:0
+		y := (max - firstLineShown - nFullLinesShown + 1) max:0
-]
+	    ]
-]
+	]
 ].
 (x == 0 and:[y == 0]) ifTrue:[                              "/ has viewOrigin changed ?
-^ self
+	^ self
 ].
 (noLn := y) ~~ 0 ifTrue:[
-y := y * fontHeight
+	y := y * fontHeight
 ].
 delta := (x @ y).
 newFirstLine := firstLineShown + noLn.
 newViewOrigin := viewOrigin + delta.
 newLeftOffset := newViewOrigin x.
 (shown and:[doRedraw]) ifFalse:[
-self originWillChange.
+	self originWillChange.
-firstLineShown := newFirstLine.
+	firstLineShown := newFirstLine.
-viewOrigin := newViewOrigin.
+	viewOrigin := newViewOrigin.
-leftOffset := newLeftOffset.
+	leftOffset := newLeftOffset.
-^ self originChanged:delta
+	^ self originChanged:delta
 ].
 "/    (self sensor notNil and: [self sensor hasExposeEventFor:self]) ifTrue:[               "/ outstanding expose events
 "/        self invalidate.                                        "/ redraw all
 "/        self originWillChange.
 (     (y ~~ 0 and:[x ~~ 0])                                 "/ both x and y changed
 or:[(noLn abs) >= nLinesShown                             "/ at least one area is
 or:[(x abs) > (width // 4 * 3)]]                          "/ big enough to redraw all
 ) ifTrue:[
-self originWillChange.
+	self originWillChange.
-firstLineShown := newFirstLine.
+	firstLineShown := newFirstLine.
-viewOrigin := newViewOrigin.
+	viewOrigin := newViewOrigin.
-leftOffset := newLeftOffset.
+	leftOffset := newLeftOffset.
-self invalidate.
+	self invalidate.
-^ self originChanged:delta
+	^ self originChanged:delta
 ].
 self repairDamage.
 self originWillChange.
 self catchExpose.
 x == 0 ifTrue:[                                             "/ scrolling vertical
-y0 := textStartTop + (y abs).
+	y0 := textStartTop + (y abs).
-h  := height - margin - y0.
+	h  := height - margin - y0.
-w  := width - margin.
+	w  := width - margin.
-y > 0 ifTrue:[                                          "/ copy down
+	y > 0 ifTrue:[                                          "/ copy down
-self copyFrom:self
+	    self copyFrom:self
-x:0 y:y0 toX:0 y:textStartTop
+			x:0 y:y0 toX:0 y:textStartTop
-width:w height:h async:true.
+		    width:w height:h async:true.
-y1 := h.
+	    y1 := h.
-] ifFalse:[                                             "/ copy up
+	] ifFalse:[                                             "/ copy up
-self copyFrom:self
+	    self copyFrom:self
-x:margin y:textStartTop toX:margin y:y0
+			x:margin y:textStartTop toX:margin y:y0
-width:w height:h async:true.
+		    width:w height:h async:true.
-y1 := 0.
+	    y1 := 0.
-].
+	].
-self redrawX:margin y:y1 width:w height:y0.
+	self redrawX:margin y:y1 width:w height:y0.
 ] ifFalse:[                                                 "/ scrolling horizontal
-x > 0 ifTrue:[                                          "/ scrolling right
+	x > 0 ifTrue:[                                          "/ scrolling right
-y0 := margin + x.
+	    y0 := margin + x.
-y1 := width - y0.
+	    y1 := width - y0.
-] ifFalse:[                                             "/ scrolling left
+	] ifFalse:[                                             "/ scrolling left
-y0 := margin - x.
+	    y0 := margin - x.
-y1 := 0.
+	    y1 := 0.
-].
+	].
-h := height - margin - margin.
+	h := height - margin - margin.
-w := width - margin - y0.
+	w := width - margin - y0.
-x > 0 ifTrue:[                                          "/ copy right
+	x > 0 ifTrue:[                                          "/ copy right
-self copyFrom:self x:y0 y:margin toX:margin y:margin
+	    self copyFrom:self x:y0 y:margin toX:margin y:margin
-width:w height:h async:true.
+		    width:w height:h async:true.
-] ifFalse:[                                             "/ copy left
+	] ifFalse:[                                             "/ copy left
-"/self copyFrom:self x:textStartLeft y:margin toX:y0 y:margin
+	    "/self copyFrom:self x:textStartLeft y:margin toX:y0 y:margin
-self copyFrom:self x:margin y:margin toX:y0 y:margin
+	    self copyFrom:self x:margin y:margin toX:y0 y:margin
-width:w height:h async:true.
+		    width:w height:h async:true.
-].
+	].
-self redrawX:y1 y:margin width:y0 height:h.
+	self redrawX:y1 y:margin width:y0 height:h.
 ].
 self waitForExpose.
 self originChanged:delta.
 line1       "{ Class: SmallInteger }"
 lineSize    "{ Class: SmallInteger }" |
 patternSize := pattern size.
 (list notNil and:[patternSize ~~ 0]) ifTrue:[
-self withCursor:Cursor questionMark do:[
+	self withCursor:Cursor questionMark do:[
-col := startCol - 1.
+	    col := startCol - 1.
-firstChar1 := pattern at:1.
+	    firstChar1 := pattern at:1.
-ignCase ifTrue:[
+	    ignCase ifTrue:[
-firstChar1 := firstChar1 asLowercase.
+		firstChar1 := firstChar1 asLowercase.
-firstChar2 := firstChar1 asUppercase.
+		firstChar2 := firstChar1 asUppercase.
-] ifFalse:[
+	    ] ifFalse:[
-firstChar2 := firstChar1
+		firstChar2 := firstChar1
-].
+	    ].
-col > (list at:startLine) size ifTrue:[
+	    col > (list at:startLine) size ifTrue:[
-col := -999
+		col := -999
-].
+	    ].
-line1 := startLine.
+	    line1 := startLine.
-line1 to:1 by:-1 do:[:lnr |
+	    line1 to:1 by:-1 do:[:lnr |
-lineString := list at:lnr.
+		lineString := list at:lnr.
-lineString notNil ifTrue:[
+		lineString notNil ifTrue:[
-lineSize := lineString size.
+		    lineSize := lineString size.
-col == -999 ifTrue:[col := lineSize - patternSize + 1].
+		    col == -999 ifTrue:[col := lineSize - patternSize + 1].
-[(col > 0)
+		    [(col > 0)
-and:[(c := lineString at:col) ~= firstChar1
+		     and:[(c := lineString at:col) ~= firstChar1
-and:[c ~= firstChar2]]] whileTrue:[
+		     and:[c ~= firstChar2]]] whileTrue:[
-col := col - 1
+			col := col - 1
-].
+		    ].
-[col > 0] whileTrue:[
+		    [col > 0] whileTrue:[
-cc := col.
+			cc := col.
-found := true.
+			found := true.
-1 to:patternSize do:[:cnr |
+			1 to:patternSize do:[:cnr |
-cc > lineSize ifTrue:[
+			    cc > lineSize ifTrue:[
-found := false
+				found := false
-] ifFalse:[
+			    ] ifFalse:[
-pc := pattern at:cnr.
+				pc := pattern at:cnr.
-c := lineString at:cc.
+				c := lineString at:cc.
-pc ~= c ifTrue:[
+				pc ~= c ifTrue:[
-(ignCase not or:[pc asLowercase ~= c asLowercase]) ifTrue:[
+				    (ignCase not or:[pc asLowercase ~= c asLowercase]) ifTrue:[
-found := false
+					found := false
-]
+				    ]
-]
+				]
-].
+			    ].
-cc := cc + 1
+			    cc := cc + 1
-].
+			].
-found ifTrue:[
+			found ifTrue:[
-^ block1 value:lnr value:col.
+			    ^ block1 value:lnr value:col.
-].
+			].
-col := col - 1.
+			col := col - 1.
-[(col > 0)
+			[(col > 0)
-and:[(c := lineString at:col) ~= firstChar1
+			and:[(c := lineString at:col) ~= firstChar1
-and:[c ~= firstChar2]]] whileTrue:[
+			and:[c ~= firstChar2]]] whileTrue:[
-col := col - 1
+			    col := col - 1
-]
+			]
-]
+		    ]
-].
+		].
-col := -999.
+		col := -999.
-]
+	    ]
-]
+	]
 ].
 "not found"
 ^ block2 value
 "search for a pattern, if found evaluate block1 with row/col as arguments, if not
 found evaluate block2.
 Sorry, but pattern is no regular expression pattern (yet)"
 ^ self
-searchBackwardFor:pattern
+	searchBackwardFor:pattern
-ignoreCase:false
+	ignoreCase:false
-startingAtLine:startLine col:startCol
+	startingAtLine:startLine col:startCol
-ifFound:block1
+	ifFound:block1
-ifAbsent:block2
+	ifAbsent:block2
 "Modified: 13.9.1997 / 01:07:36 / cg"
 !
 searchForwardFor:pattern ignoreCase:ignCase startingAtLine:startLine col:startCol ifFound:block1 ifAbsent:block2
 line2 "{Class: SmallInteger}"
 p realPattern|
 patternSize := pattern size.
 (list notNil and:[patternSize ~~ 0]) ifTrue:[
-self withCursor:Cursor questionMark do:[
+	self withCursor:Cursor questionMark do:[
-col := startCol + 1.
+	    col := startCol + 1.
-line1 := startLine.
+	    line1 := startLine.
-line2 := list size.
+	    line2 := list size.
-pattern includesUnescapedMatchCharacters ifTrue:[
+	    pattern includesUnescapedMatchCharacters ifTrue:[
-p := pattern species new:0.
+		p := pattern species new:0.
-(pattern startsWith:$*) ifFalse:[
+		(pattern startsWith:$*) ifFalse:[
-p := p , '*'
+		    p := p , '*'
-].
+		].
-p := p , pattern.
+		p := p , pattern.
-(pattern endsWith:$*) ifFalse:[
+		(pattern endsWith:$*) ifFalse:[
-p := p , '*'
+		    p := p , '*'
-].
+		].
-realPattern := pattern.
+		realPattern := pattern.
-(realPattern startsWith:$*) ifTrue:[
+		(realPattern startsWith:$*) ifTrue:[
-realPattern := realPattern copyFrom:2
+		    realPattern := realPattern copyFrom:2
-].
+		].
-line1 to:line2 do:[:lnr |
+		line1 to:line2 do:[:lnr |
-lineString := list at:lnr.
+		    lineString := list at:lnr.
-lineString notNil ifTrue:[
+		    lineString notNil ifTrue:[
-"/ first a crude check ...
+			"/ first a crude check ...
-(p match:lineString ignoreCase:ignCase) ifTrue:[
+			(p match:lineString ignoreCase:ignCase) ifTrue:[
-"/ ok, there it is; look at which position
+			    "/ ok, there it is; look at which position
-col := lineString
+			    col := lineString
-findMatchString:realPattern
+					findMatchString:realPattern
-startingAt:col
+					startingAt:col
-ignoreCase:ignCase
+					ignoreCase:ignCase
-ifAbsent:0.
+					ifAbsent:0.
-col ~~ 0 ifTrue:[
+			    col ~~ 0 ifTrue:[
-^ block1 value:lnr value:col.
+				^ block1 value:lnr value:col.
-]
+			    ]
-].
+			].
-].
+		    ].
-col := 1
+		    col := 1
-]
+		]
-] ifFalse:[
+	    ] ifFalse:[
-p := pattern withoutMatchEscapes.
+		p := pattern withoutMatchEscapes.
-line1 to:line2 do:[:lnr |
+		line1 to:line2 do:[:lnr |
-lineString := list at:lnr.
+		    lineString := list at:lnr.
-lineString isString ifTrue:[
+		    lineString isString ifTrue:[
-ignCase ifTrue:[
+			ignCase ifTrue:[
-col := lineString
+			    col := lineString
-findMatchString:p
+					findMatchString:p
-startingAt:col
+					startingAt:col
-ignoreCase:ignCase
+					ignoreCase:ignCase
-ifAbsent:0.
+					ifAbsent:0.
-] ifFalse:[
+			] ifFalse:[
-col := lineString
+			    col := lineString
-findString:p
+					findString:p
-startingAt:col
+					startingAt:col
-ifAbsent:0.
+					ifAbsent:0.
-].
+			].
-col ~~ 0 ifTrue:[
+			col ~~ 0 ifTrue:[
-^ block1 value:lnr value:col.
+			    ^ block1 value:lnr value:col.
-]
+			]
-].
+		    ].
-col := 1
+		    col := 1
-]
+		]
-].
+	    ].
-]
+	]
 ].
 "not found"
 ^ block2 value
 searchForwardFor:pattern startingAtLine:startLine col:startCol ifFound:block1 ifAbsent:block2
 "search for a pattern, if found evaluate block1 with row/col as arguments, if not
 found evaluate block2."
 ^ self
-searchForwardFor:pattern
+	searchForwardFor:pattern
-ignoreCase:false
+	ignoreCase:false
-startingAtLine:startLine col:startCol
+	startingAtLine:startLine col:startCol
-ifFound:block1
+	ifFound:block1
-ifAbsent:block2
+	ifAbsent:block2
 "Modified: 13.9.1997 / 01:07:11 / cg"
 ! !
 !ListView methodsFor:'tabulators'!
 ! !
 !ListView class methodsFor:'documentation'!
 version
-^ '$Header: /cvs/stx/stx/libwidg/ListView.st,v 1.173 1998-09-04 16:27:18 cg Exp $'
+^ '$Header: /cvs/stx/stx/libwidg/ListView.st,v 1.174 1998-09-28 09:25:54 cg Exp $'
 ! !

changeset 1693	e76979454c2f
parent 1656	1202fbc95970
child 1699	b10682bac6f9