hg/stx-libwidg: comparison EditTextView.st

equal deleted inserted replaced

-:bccbb97e8ab6
+:aaef7f02402c
 		lastReplacement lastAction replacing showMatchingParenthesis
 		hasKeyboardFocus acceptAction lockUpdates tabMeansNextField
 		autoIndent insertMode trimBlankLines wordWrap
 		replacementWordSelectStyle acceptChannel acceptEnabled st80Mode
 		disableIfInvisible cursorMovementWhenUpdating learnMode
-		learnedMacro'
+		learnedMacro cursorLineHolder cursorColHolder'
 	classVariableNames:'DefaultCursorForegroundColor DefaultCursorBackgroundColor
 		DefaultCursorType DefaultCursorNoFocusForegroundColor ST80Mode
 		DefaultCursorTypeNoFocus'
 	poolDictionaries:''
 	category:'Views-Text'
 This is the absolute col; NOT the visible col"
 ^ cursorCol
 !
+cursorColHolder
+"return a valueHolder for the cursors column (1..)."
+^ cursorColHolder
+!
 cursorLine
 "return the cursors line (1..).
 This is the absolute line; NOT the visible line"
 ^ cursorLine
+!
+cursorLineHolder
+"return a valueHolder for the cursors line (1..).
+This is the absolute line; NOT the visible line"
+^ cursorLineHolder
 !
 fixedSize
 "make the texts size fixed (no lines may be added).
 OBSOLETE: use readOnly"
 "move cursor to some column in the current line"
 |wasOn|
 wasOn := self hideCursor.
-cursorCol := self validateCursorCol:newCol inLine:cursorLine.
+self setValidatedCursorCol:newCol.
 self makeCursorVisibleAndShowCursor:wasOn.
 "Modified: 22.5.1996 / 14:25:53 / cg"
 !
 self cursorDown:1.
 "/ cursor behond text ?
 cursorLine > list size ifTrue:[
 wasOn := self hideCursor.
-cursorLine := self validateCursorLine:(list size + 1).
+self setValidatedCursorLine:(list size + 1) col:cursorCol.
-cursorCol := self validateCursorCol:cursorCol inLine:cursorLine.
-cursorVisibleLine := self listLineToVisibleLine:cursorLine.
-"/ wasOn ifTrue:[self showCursor].
 self makeCursorVisibleAndShowCursor:wasOn.
 self beep.
 ].
 "Modified: / 10.6.1998 / 17:00:23 / cg"
 !
 cursorDown:n
 "move cursor down by n lines; scroll if at end of visible text"
-|wasOn nv|
+|wasOn nv nL|
 cursorVisibleLine notNil ifTrue:[
 wasOn := self hideCursor.
 nv := cursorVisibleLine + n - 1.
 (nv >= nFullLinesShown) ifTrue:[
 self scrollDown:(nv - nFullLinesShown + 1)
 ].
-cursorLine := self validateCursorLine:(cursorLine + n).
+self setValidatedCursorLine:(cursorLine + n) col:cursorCol.
-cursorCol := self validateCursorCol:cursorCol inLine:cursorLine.
-cursorVisibleLine := self listLineToVisibleLine:cursorLine.
-"/ wasOn ifTrue:[self showCursor].
 self makeCursorVisibleAndShowCursor:wasOn.
 ] ifFalse:[
-cursorLine isNil ifTrue:[
+(nL := cursorLine) isNil ifTrue:[
-cursorLine := firstLineShown
+nL := firstLineShown
 ].
-cursorLine := self validateCursorLine:(cursorLine + n).
+self setValidatedCursorLine:(nL + n) col:cursorCol.
-cursorCol := self validateCursorCol:cursorCol inLine:cursorLine.
-cursorVisibleLine := self listLineToVisibleLine:cursorLine.
 self makeCursorVisible.
 ].
 "Modified: / 10.6.1998 / 16:59:17 / cg"
 !
 "this positions onto physical - not visible - line"
 |wasOn newCol|
 wasOn := self hideCursor.
-cursorLine := self validateCursorLine:line.
+self setValidatedCursorLine:line.
-cursorVisibleLine := self listLineToVisibleLine:cursorLine.
 (col < 1) ifTrue:[
 newCol := 1
 ] ifFalse:[
 newCol := col.
 ].
 (cursorLine == list size
 and:[cursorLine ~~ line]) ifTrue:[
 newCol := (self listAt:(list size)) size + 1.
 ]
 ].
-cursorCol := self validateCursorCol:newCol inLine:cursorLine.
+self setValidatedCursorCol:newCol.
 self makeCursorVisibleAndShowCursor:wasOn.
 "Modified: / 20.6.1998 / 18:19:06 / cg"
 !
 (cursorVisibleLine >= nFullLinesShown) ifTrue:[self scrollDown]
 ]
 ].
 wasOn := self hideCursor.
-cursorLine := self validateCursorLine:cursorLine + 1.
+self setValidatedCursorLine:(cursorLine + 1) col:1.
-cursorCol := self validateCursorCol:1 inLine:cursorLine.
-cursorVisibleLine := self listLineToVisibleLine:cursorLine.
 self makeCursorVisibleAndShowCursor:wasOn.
 "Modified: 22.5.1996 / 18:27:34 / cg"
 !
 newTop := list size - nFullLinesShown.
 (newTop < 1) ifTrue:[
 newTop := 1
 ].
 self scrollToLine:newTop.
-cursorLine := self validateCursorLine:list size.
-cursorCol := self validateCursorCol:1 inLine:cursorLine.
+self setValidatedCursorLine:(list size) col:1.
-cursorVisibleLine := self listLineToVisibleLine:cursorLine.
 self makeCursorVisibleAndShowCursor:wasOn.
 "Modified: 22.5.1996 / 18:27:45 / cg"
 !
 !
 cursorToEnd
 "move cursor down below last line of text"
-|wasOn newTop l line|
+|wasOn newTop lineNr line|
-l := list size.
+lineNr := list size.
-cursorLine >= l ifTrue:[
+cursorLine >= lineNr ifTrue:[
 line := self listAt:cursorLine.
 (line isNil or:[line isEmpty]) ifTrue:[
 ^ self
 ]
 ].
 wasOn := self hideCursor.
-l := l + 1.
+lineNr := lineNr + 1.
-newTop :=  l - nFullLinesShown.
+newTop :=  lineNr - nFullLinesShown.
 (newTop < 1) ifTrue:[
 newTop := 1
 ].
 self scrollToLine:newTop.
-cursorLine := self validateCursorLine:l.
-cursorCol := self validateCursorCol:1 inLine:1.
+self setValidatedCursorLine:lineNr col:1.
-cursorVisibleLine := self listLineToVisibleLine:cursorLine.
 self makeCursorVisibleAndShowCursor:wasOn.
 "Modified: 22.5.1996 / 18:27:53 / cg"
 !
 newTop := list size - nFullLinesShown.
 (newTop < 1) ifTrue:[
 newTop := 1
 ].
 self scrollToLine:newTop.
-cursorLine := self validateCursorLine:list size.
-cursorCol := self validateCursorCol:(self listAt:cursorLine) size inLine:cursorLine.
+self setValidatedCursorLine:list size.
-cursorVisibleLine := self listLineToVisibleLine:cursorLine.
+self setCursorCol:(self validateCursorCol:(self listAt:cursorLine) size inLine:cursorLine).
 self makeCursorVisibleAndShowCursor:wasOn.
 !
 cursorToFirstVisibleLine
 "place cursor into the first visible line; do not scroll."
 "move the cursor to the beginning of the next word"
 |col line searching|
 (cursorLine > list size) ifTrue:[^ self].
 self wordAtLine:cursorLine col:cursorCol do:[
 :beginLine :beginCol :endLine :endCol :style |
 line := endLine.
 col := endCol + 1.
 cursorToPreviousWord
 "move the cursor to the beginning of this or the previous word"
 |col line searching l|
-(cursorLine > list size) ifTrue:[^ self].
+(cursorLine > list size) ifTrue:[^ self].      "/ this is rubbish
 self wordAtLine:cursorLine col:cursorCol do:[
 :beginLine :beginCol :endLine :endCol :style |
 line := beginLine.
 "move cursor up n lines; scroll if at start of visible text"
 |wasOn nv nl|
 cursorLine isNil ifTrue:[
-cursorLine := firstLineShown + nFullLinesShown - 1.
+self setCursorLine:(firstLineShown + nFullLinesShown - 1).
 ].
 nl := cursorLine - n.
 nl < 1 ifTrue:[nl := 1].
 (nl ~~ cursorLine) ifTrue: [
 nv := cursorVisibleLine - n.
 nv < 1 ifTrue:[
 self scrollUp:(nv negated + 1)
 ].
 ].
-cursorLine := self validateCursorLine:nl.
+self setValidatedCursorLine:nl col:cursorCol.
-cursorVisibleLine := self listLineToVisibleLine:cursorLine.
-cursorCol := self validateCursorCol:cursorCol inLine:cursorLine.
 wasOn ifTrue:[self showCursor].
-"/
-"/ to make cursor visible (even if below visible end):
-"/
-"/      self makeCursorVisibleAndShowCursor:wasOn.
 ]
 "Modified: 22.5.1996 / 18:28:11 / cg"
 !
 cursorVisibleLine:visibleLineNr col:colNr
 "put cursor to visibleline/col"
-|wasOn newCol|
+|wasOn newCol listLine|
 wasOn := self hideCursor.
-cursorLine := self validateCursorLine:(self visibleLineToAbsoluteLine:visibleLineNr).
+listLine := self visibleLineToAbsoluteLine:visibleLineNr.
+self setValidatedCursorLine:listLine.
 cursorVisibleLine := visibleLineNr.
 newCol := colNr.
 (newCol < 1) ifTrue:[
 newCol := 1
 ].
-cursorCol := self validateCursorCol:newCol inLine:cursorLine.
+self setValidatedCursorCol:newCol.
 self makeCursorVisibleAndShowCursor:wasOn.
 "Modified: / 20.6.1998 / 18:40:28 / cg"
 !
 "scroll to make cursorLine visible;
 if flag is true, draw the cursor"
 self makeCursorVisible.
 flag ifTrue:[self showCursor]
+!
+setCursorCol:colNr
+"strictly private: set the cursorCol"
+cursorCol := colNr.
+cursorColHolder value:cursorCol.
+!
+setCursorLine:lineNr
+"strictly private: set the cursorLine"
+cursorLine := lineNr.
+cursorLineHolder value:cursorLine.
+self updateCursorVisibleLine.
+!
+setCursorLine:lineNr col:colNr
+"strictly private: set the cursorLine, col and update the visibleLine"
+self setCursorLine:lineNr.
+self setCursorCol:colNr.
+!
+setValidatedCursorCol:colNr
+"strictly private: set the cursorCol"
+self setCursorCol:(self validateCursorCol:colNr inLine:cursorLine).
+!
+setValidatedCursorLine:lineNr
+"strictly private: set the cursorLine and update the visibleLine"
+self setCursorLine:(self validateCursorLine:lineNr).
+!
+setValidatedCursorLine:lineNr col:colNr
+"strictly private: set the cursorLine, col and update the visibleLine"
+self setValidatedCursorLine:lineNr.
+self setValidatedCursorCol:colNr.
 !
 showCursor
 "make cursor visible if currently invisible"
 ].
 super redrawVisibleLine:cursorVisibleLine col:cursorCol
 ]
 "Modified: / 15.12.1999 / 22:25:59 / cg"
+!
+updateCursorVisibleLine
+"strictly private: set the visibleLine from the cursorLine.
+notice: visibleLine will be set to nil if the cursor is not visible"
+cursorVisibleLine := self listLineToVisibleLine:cursorLine.
 !
 validateCursorCol:col inLine:line
 "check of col is a valid cursor position; return a new col-nr if not.
 Here, no limits are enforced (and col is returned),
 startLine := selectionStartLine.
 startCol := selectionStartCol.
 endLine := selectionEndLine.
 endCol := selectionEndCol.
 self unselectWithoutRedraw.
-self deleteFromLine:startLine col:startCol
+self deleteFromLine:startLine col:startCol toLine:endLine col:endCol.
-toLine:endLine col:endCol.
+self setCursorLine:startLine col:startCol.
-cursorCol := startCol.
-cursorLine := startLine.
-cursorVisibleLine := self listLineToVisibleLine:cursorLine.
 self makeCursorVisibleAndShowCursor:wasOn
 ]
 !
 deleteWordBeforeCursor
 self cursorToPreviousWord.
 beginCol := cursorCol.
 beginLine := cursorLine.
 deletedText := self textFromLine:beginLine col:beginCol toLine:endLine col:endCol.
 self deleteFromLine:beginLine col:beginCol toLine:endLine col:endCol.
-undoAction := [ self cursorLine:beginLine col:beginCol.
+undoAction := [
-self paste:deletedText].
+self cursorLine:beginLine col:beginCol.
+self paste:deletedText
+].
 wasOn ifTrue:[ self showCursor ].
 "Modified: / 22.2.2000 / 23:59:04 / cg"
 !
 ].
 (start < nLines) ifTrue:[
 (end >= start) ifTrue:[
 wasOn := self hideCursor.
 self insertLines:lines from:start to:end before:cursorLine.
-cursorLine := cursorLine + (end - start + 1).
+self setCursorLine:(cursorLine + (end - start + 1)).
-cursorVisibleLine := self absoluteLineToVisibleLine:cursorLine.
 wasOn ifTrue:[self showCursor].
 ]
 ].
 withCr ifFalse:[
 "last line without cr"
 insertStringWithoutCRsAtCursor:aString
 "insert a string (which has no crs) at cursor position
 - advance cursor"
-|wasOn oldLen newLen|
+|wasOn oldLen newLen deltaLen|
-aString notNil ifTrue:[
+aString size > 0 ifTrue:[
 wasOn := self hideCursor.
 (aString includes:Character tab) ifTrue:[
 self checkForExistingLine:cursorLine.
 oldLen := (list at:cursorLine) size.
 self insertString:aString atLine:cursorLine col:cursorCol.
 newLen := (list at:cursorLine) size.
-cursorCol := cursorCol + (newLen - oldLen).
+deltaLen := newLen - oldLen.
 ] ifFalse:[
 self insertString:aString atLine:cursorLine col:cursorCol.
-cursorCol := cursorCol + aString size.
+deltaLen := aString size.
 ].
+self setCursorCol:(cursorCol + deltaLen).
 wasOn ifTrue:[self showCursor]
 ]
 "Modified: / 10.6.1998 / 20:43:52 / cg"
 !
 selectionStartLine notNil ifTrue:[
 self cursorMovementAllowed ifTrue:[
 "/
 "/ treat the whole selection as cursor
 "/
-cursorLine := selectionEndLine.
+self setCursorLine:selectionEndLine.
-cursorVisibleLine := self listLineToVisibleLine:cursorLine.
 selectionEndCol == 0 ifTrue:[
 selectionEndCol := 1.
 ].
-cursorCol := selectionEndCol.
+self setCursorCol:selectionEndCol.
 shifted ifTrue:[
 self expandSelectionRight.
 ^ self
 ].
 self unselect; makeCursorVisible.
 selectionStartLine notNil ifTrue:[
 self cursorMovementAllowed ifTrue:[
 "/
 "/ treat the whole selection as cursor
 "/
-cursorLine := selectionEndLine.
+self setCursorLine:selectionEndLine.
-cursorVisibleLine := self listLineToVisibleLine:cursorLine.
+self setCursorCol:selectionStartCol.
-cursorCol := selectionStartCol.
 cursorCol == 0 ifTrue:[
-cursorCol := 1.
+self setCursorCol:1.
-cursorLine := cursorLine - 1.
+self setCursorLine:(cursorLine - 1).
-cursorVisibleLine := self listLineToVisibleLine:cursorLine.
 ].
 self makeCursorVisible.
 shifted ifTrue:[
 clickLine := cursorLine.
 selectionStartLine notNil ifTrue:[
 self cursorMovementAllowed ifTrue:[
 "/
 "/ treat the whole selection as cursor
 "/
-cursorLine := selectionStartLine.
+self setCursorLine:selectionStartLine.
-cursorVisibleLine := self listLineToVisibleLine:cursorLine.
+self setCursorCol:selectionStartCol.
-cursorCol := selectionStartCol.
 (key == #CursorLeft) ifTrue:[
-cursorCol := cursorCol+1.  "/ compensate for followup crsr-left
+self setCursorCol:(cursorCol+1).  "/ compensate for followup crsr-left
 ].
 self makeCursorVisible.
 shifted ifTrue:[
 (key == #CursorUp) ifTrue:[
 mapped
 "view was made visible"
 super mapped.
-"/    self makeCursorVisible.
+self updateCursorVisibleLine.
-cursorVisibleLine := self listLineToVisibleLine:cursorLine.
-"Modified: 20.12.1996 / 14:15:56 / cg"
 !
 sizeChanged:how
 "make certain, cursor is visible after the sizechange"
 self level:-1.
 readOnly := false.
 fixedSize := false.
 exceptionBlock := [:errorText | ].
 cursorShown := prevCursorState := true.
+cursorLineHolder := 1 asValue.
+cursorColHolder := 1 asValue.
 cursorLine := 1.
 cursorVisibleLine := 1.
 cursorCol := 1.
 modifiedChannel := ValueHolder with:false.
 acceptChannel := ValueHolder with:false.
 super originChanged:delta.
 "
 should we move the cursor with the scroll - or leave it ?
 "
-cursorVisibleLine := self listLineToVisibleLine:cursorLine.
+self updateCursorVisibleLine.
 prevCursorState ifTrue:[
 self showCursor
 ]
 "Modified: / 17.6.1998 / 16:13:24 / cg"
 ! !
 !EditTextView class methodsFor:'documentation'!
 version
-^ '$Header: /cvs/stx/stx/libwidg/EditTextView.st,v 1.255 2001-10-02 16:32:19 cg Exp $'
+^ '$Header: /cvs/stx/stx/libwidg/EditTextView.st,v 1.256 2001-10-04 12:54:24 cg Exp $'
 ! !

changeset 2422	aaef7f02402c
parent 2417	c23c7c09c2a9
child 2427	43cc7ea39bac