hg/stx-libwidg: comparison ETxtView.st

equal deleted inserted replaced

-:1a9e22f755c8
+:aa16d9b96e40
 deleteFromLine:startLine col:startCol toLine:endLine col:endCol
 "delete all text from startLine/startCol to endLine/endCol -
 joining lines if nescessary"
-|line lineSize|
+|line newLine lineSize nMore|
 self checkModificationsAllowed ifFalse:[ ^ self].
 list isNil ifTrue:[^ self].
 startLine > list size ifTrue:[ ^ self]. "/ deleted space below text
 "/ must add blanks, if startCol lies behond end of startLine
 line := list at:startLine.
 lineSize := line size.
 (startCol > lineSize) ifTrue:[
+newLine := line.
 line isNil ifTrue:[
-line := String new:(startCol - 1)
+newLine := String new:(startCol - 1)
 ] ifFalse:[
-line := line , (line species new:(startCol - 1 - lineSize))
+nMore := startCol - 1 - lineSize.
+nMore > 0 ifTrue:[
+newLine := line , (line species new:nMore)
+]
 ].
-list at:startLine put:line.
+newLine ~~ line ifTrue:[
+list at:startLine put:newLine.
+].
 "/ TODO: remember old maxwidth of linerange,
 "/ only clear widthOfWidestLine, if this max
 "/ length was (one of) the longest.
 "/ avoids slow delete with huge texts.
 widthOfWidestLine := nil. "/ i.e. unknown
 self textChanged.
 ]
 ].
 "/ merge the left rest of 1st line with right rest of last line into one
-self mergeLine:startLine
+self mergeLine:startLine removeBlanks:false
 "Modified: / 10.11.1998 / 23:52:59 / cg"
 !
 deleteFromLine:startLineNr toLine:endLineNr
 !EditTextView methodsFor:'menu actions'!
 cut
 "cut selection into copybuffer"
-|line col history sel|
+|line col history sel s|
 (self checkModificationsAllowed) ifFalse:[
 self flash.
 ^ self
 ].
 sel := self selection.
 sel notNil ifTrue:[
-lastString := sel asStringWithCRs.
+lastString := s := sel asStringWithCRs.
 line := selectionStartLine.
 col := selectionStartCol.
-undoAction := [self insertString:lastString atLine:line col:col].
+undoAction := [ self cursorLine:line col:col.
+self insertLines:(Array with:s) withCR:false.
+].
 "
 remember in CopyBuffer
 "
 self setTextSelection:lastString.
 items := #(
 ('again (for all)'      multipleAgain)
 ).
 ] ifFalse:[
 items := #(
-"/                       ('undo'     undo                   )
+('undo'     undo                   )
 ('again'   again            Again  )
 ('-'                               )
 ('copy'    copySelection    Copy   )
 ('cut'     cut              Cut    )
 ('paste'   pasteOrReplace   Paste  )
 m disable:#copySelection.
 ].
 (self hasSelection not or:[self isReadOnly]) ifTrue:[
 m disable:#cut.
 ].
+(undoAction isNil) ifTrue:[
+m disable:#undo.
+].
 acceptEnabled == false ifTrue:[
 m disable:#accept
 ].
 ^ m.
 !
 paste:someText
 "paste someText at cursor"
-|s nLines startLine startCol|
+|s nLines startLine startCol l1 l2 c1 c2|
 self checkModificationsAllowed ifFalse:[^ self].
 someText notNil ifTrue:[
 s := someText.
 ]
 ].
 (nLines := s size) == 0 ifTrue:[^ self].
 (nLines == 1 and:[(s at:1) size == 0]) ifTrue:[^ self].
-startLine := cursorLine.
+startLine := l1 := cursorLine.
-startCol := cursorCol.
+startCol := c1 := cursorCol.
 self insertLines:(s withTabsExpanded) withCR:false.
-self selectFromLine:startLine col:startCol
+l2 := cursorLine.
-toLine:cursorLine col:(cursorCol - 1).
+c2 := (cursorCol - 1).
+self selectFromLine:l1 col:c1 toLine:l2 col:c2.
 typeOfSelection := #paste.
-undoAction := [self cut].
+undoAction := [ self unselect.
+self deleteFromLine:l1 col:c1 toLine:l2 col:c2.
+self cursorLine:l1 col:c1.
+].
 ]
 "Modified: / 14.2.1996 / 11:14:14 / stefan"
 "Modified: / 12.6.1998 / 22:12:00 / cg"
 !
 undo
 "currently not implemented"
 undoAction notNil ifTrue:[
-	undoAction value
+undoAction value.
+undoAction := nil.
 ]
 ! !
 !EditTextView class methodsFor:'documentation'!
 version
-^ '$Header: /cvs/stx/stx/libwidg/Attic/ETxtView.st,v 1.195 1999-03-23 12:45:43 cg Exp $'
+^ '$Header: /cvs/stx/stx/libwidg/Attic/ETxtView.st,v 1.196 1999-03-24 20:06:11 cg Exp $'
 ! !

changeset 1818	aa16d9b96e40
parent 1817	1a9e22f755c8
child 1819	963883688bc7