hg/stx-libwidg2: comparison TerminalView.st

equal deleted inserted replaced

-:9c7777ad9594
+:221cae81c950
 "/].
 "/self showCursor.
 "/^ self.
 access critical:[
-|i i2 s crnlFollows|
+|index controlCharIndex stringWithOutControl crnlFollows|
-i := 1.
+index := 1.
-[i <= count] whileTrue:[
+[index <= count] whileTrue:[
 (state == 0) ifTrue:[
 "/ in initial state.
 "/ quick scan forward for next control character ...
-i2 := buffer indexOfControlCharacterStartingAt:i.
+controlCharIndex := buffer indexOfControlCharacterStartingAt:index.
-i2 > count ifTrue:[i2 := 0].
+controlCharIndex > count ifTrue:[controlCharIndex := 0].
-i2 == 0 ifTrue:[
+controlCharIndex == 0 ifTrue:[
 "/ no control characters - simply append all
 "/ to the outstanding lines ...
-s := buffer copyFrom:i to:count.
+stringWithOutControl := buffer copyFrom:index to:count.
-i := count + 1. "/ leave loop.
+index := count + 1. "/ leave loop.
 crnlFollows := false.
 ] ifFalse:[
-i2 > i ifTrue:[
+controlCharIndex > index ifTrue:[
-s := buffer copyFrom:i to:i2-1.
+stringWithOutControl := buffer copyFrom:index to:controlCharIndex-1.
-i := i2. "/ proceed withcontrol character
+index := controlCharIndex. "/ proceed withcontrol character
 crnlFollows := false.
-i < (count - 1) ifTrue:[
+index < (count - 1) ifTrue:[
-(buffer at:i) == Character return ifTrue:[
+(buffer at:index) == Character return ifTrue:[
-(buffer at:i+1) == Character nl ifTrue:[
+(buffer at:index+1) == Character nl ifTrue:[
 crnlFollows := true.
-i := i + 2.
+index := index + 2.
 ]
 ]
 ].
 ]
 ].
 ].
-s notNil ifTrue:[
+stringWithOutControl notNil ifTrue:[
 currentEmphasis notNil ifTrue:[
-s := s emphasizeAllWith:currentEmphasis
+stringWithOutControl := stringWithOutControl emphasizeAllWith:currentEmphasis
 ].
 outstandingLine size > 0 ifTrue:[
-outstandingLine := outstandingLine , s.
+outstandingLine := outstandingLine , stringWithOutControl.
 ] ifFalse:[
-outstandingLine := s.
+outstandingLine := stringWithOutControl.
 ].
 crnlFollows ifTrue:[
 outstandingLines isNil ifTrue:[
 outstandingLines := OrderedCollection with:outstandingLine
 ] ifFalse:[
 outstandingLines add:outstandingLine.
 ].
 outstandingLine := ''.
 ].
-s := nil.
+stringWithOutControl := nil.
 collecting ifTrue:[
 flushPending ifFalse:[
 self installDelayedUpdate
 ] ifTrue:[
 ] ifFalse:[
 "/ no chunk to append (in an escape sequence)
 "/ must handle individual characters
 "/ to update the state machine.
-self nextPut:(buffer at:i).
+self nextPut:(buffer at:index).
-i := i + 1.
+index := index + 1.
-[state ~~ 0 and:[i <= count]] whileTrue:[
+[state ~~ 0 and:[index <= count]] whileTrue:[
-self nextPut:(buffer at:i).
+self nextPut:(buffer at:index).
-i := i + 1.
+index := index + 1.
 ]
 ]
 ].
 ].
 ! !
 !TerminalView class methodsFor:'documentation'!
 version
-^ '$Header: /cvs/stx/stx/libwidg2/TerminalView.st,v 1.98 2002-09-05 12:41:42 cg Exp $'
+^ '$Header: /cvs/stx/stx/libwidg2/TerminalView.st,v 1.99 2002-09-17 09:07:29 penk Exp $'
 ! !

changeset 2191	221cae81c950
parent 2169	132759c9c32c
child 2192	5f3bf896d334