hg/stx-libwidg: comparison EditTextView.st

equal deleted inserted replaced

-:1b6d4d75a3d0
+:9a6809da7351
 !EditTextView class methodsFor:'defaults'!
 st80Mode
 "return true, if the st80 editing mode is turned on.
 This setting affects the behavior of the cursor, when positioned
-beyond the end of a line or the end of the text.
+beyond the end of a line or the end of the text."
-The default is initialized from the viewStyle."
 ^ UserPreferences current st80EditMode
 "
 EditTextView st80Mode:true
 "move cursor to left"
 (cursorCol ~~ 1) ifTrue:[
 self cursorCol:(cursorCol - 1)
 ] ifFalse:[
-"/ no, do not wrap back to previous line
+cursorLine ~~ 1 ifTrue:[
-"/        cursorLine ~~ 1 ifTrue:[
+self st80EditMode ifTrue:[
-"/            self st80Mode == true ifTrue:[
+self cursorUp.
-"/                self cursorUp.
+self cursorToEndOfLine.
-"/                self cursorToEndOfLine.
+]
-"/           ]
+]
-"/        ]
 ]
 "Modified: / 23.1.1998 / 12:37:13 / cg"
 !
 cursorRight
 "move cursor to right"
 |l|
-self st80EditMode == true ifTrue:[
+self st80EditMode ifTrue:[
 l := (self listAt:cursorLine).
 cursorCol >= (l size + 1) ifTrue:[
-"/ no, do not wrap to next line
+cursorLine < list size ifTrue:[
-"/            cursorLine < list size ifTrue:[
+self cursorReturn.
-"/                self cursorReturn.
+].
-"/            ].
 ^ self
 ]
 ].
 self cursorCol:(cursorCol + 1)
 |l max|
 "/ in ST80 mode,
 "/ the cursor may not be positioned beyond the
 "/ end of a line or beyond the last line of the text
-"/
-self st80EditMode == true ifTrue:[
+self st80EditMode ifTrue:[
 l := (self listAt:line).
 max := l size + 1.
 col > max ifTrue:[
 ^ max
 ]
 "/
 "/ in st80Mode, the cursor may not be positioned
 "/ beyond the last line
 "/
-self st80EditMode == true ifTrue:[
+self st80EditMode ifTrue:[
 ^ (line min:(list size)) max:1
 ].
 ^ line
 "Created: / 22.5.1996 / 18:22:23 / cg"
 wasOn ifTrue:[self showCursor]
 !
 deleteCharAtLine:lineNr col:colNr
 "delete a single character at colNr in line lineNr"
+self st80EditMode ifTrue:[
+(self listAt:cursorLine) size + 1 = colNr ifTrue:[
+| wasOn |
+wasOn := self hideCursor.
+self
+cursorReturn;
+cursorCol:1;
+deleteCharBeforeCursor.
+wasOn ifTrue:[ self showCursor].
+^ self.
+].
+].
 self deleteCharsAtLine:lineNr fromCol:colNr toCol:colNr
 !
 deleteCharBeforeCursor
 drawCharacterOnly := false.
 self checkForExistingLine:lineNr.
 line := list at:lineNr.
 lineSize := line size.
-self st80EditMode ~~ true ifTrue:[
+self st80EditMode ifFalse:[
 (trimBlankLines
 and:[colNr > lineSize
 and:[aCharacter == Character space]]) ifTrue:[
 ^ self
 ]
 #InsertLine
 #SelectLineFromBeginning
 #LearnKeyboardMacro #ExecuteKeyboardMacro
 #'F*' #'f*')>
-|fKeyMacros shifted i event cmdMacro|
+|fKeyMacros shiftPressed ctrlPressed i event cmdMacro|
 event := WindowGroup lastEventQuerySignal query.
-shifted := event hasShift.
+shiftPressed := event hasShift.
+ctrlPressed := event hasCtrl.
 cmdMacro := UserPreferences current functionKeySequences at:key ifAbsent:nil.
 cmdMacro notNil ifTrue:[
 self executeKeyboardMacro:cmdMacro.
 ^ self
 ].
 ^ self
 ].
 self makeCursorVisible.
-shifted ifTrue:[
+shiftPressed ifTrue:[
 self deleteWordBeforeCursor.
 ] ifFalse:[
 self deleteCharBeforeCursor.
 ].
 see TextView>>:x:y
 "
 (key at:1) asLowercase == $f ifTrue:[
 (('[fF][0-9]' match:key)
 or:['[fF][0-9][0-9]' match:key]) ifTrue:[
-shifted ifFalse:[
+shiftPressed ifFalse:[
 fKeyMacros := UserPreferences current functionKeySequences.
 fKeyMacros notNil ifTrue:[
 (fKeyMacros includesKey:key) ifTrue:[
 self pasteOrReplace:(fKeyMacros at:key) asStringCollection.
 ^ self
 (key == #Ctrln) ifTrue:[self unselect. self cursorDown. ^ self].
 (key == #Ctrlp) ifTrue:[self unselect. self cursorUp. ^ self].
 "
 (key == #BeginOfLine) ifTrue:[
-self unselect.
+shiftPressed ifTrue: [
-shifted ifTrue:[
+"/ "Original St/X code - now use Ctrl modifier"
-self cursorHome
+"/ self unselect.
+"/ self cursorHome.
+"Jan's modification"
+self addToSelectionAfter:[ self cursorToBeginOfLine ].
+] ifFalse: [
+self unselect.
+ctrlPressed ifTrue:[
+self cursorHome.
+] ifFalse:[
+self cursorToBeginOfLine.
+]
+].
+^ self
+].
+(key == #EndOfLine) ifTrue:[
+shiftPressed ifTrue:[
+"/ "Original St/X code - now use Ctrl modifier"
+"/ self unselect.
+"/ self cursorToBottom
+"Jan's modification"
+self addToSelectionAfter:[ self cursorToEndOfLine ] .
 ] ifFalse:[
-self cursorToBeginOfLine.
+self unselect.
-].
+ctrlPressed ifTrue:[
-^ self
+self cursorToBottom
-].
+] ifFalse:[
-(key == #EndOfLine) ifTrue:[
+self cursorToEndOfLine.
-self unselect.
+]
-shifted ifTrue:[
-self cursorToBottom
-] ifFalse:[
-self cursorToEndOfLine.
 ].
 ^ self
 ].
 (key == #NextWord) ifTrue:[self cursorToNextWord. ^self].
 (key == #PreviousWord) ifTrue:[self cursorToPreviousWord. ^self].
 (key == #CursorRight
 or:[key == #CursorDown
 or:[key == #CursorLeft
 or:[key == #CursorUp]]]) ifTrue:[
-self cursorKeyPress:key shifted:shifted.
+self cursorKeyPress:key shifted:shiftPressed.
 ^ self.
 ].
 (key == #Return)    ifTrue:[
-shifted ifTrue:[
+shiftPressed ifTrue:[
 self unselect. self cursorReturn.
 ^ self
 ].
 self isReadOnly ifTrue:[
 self unselect; makeCursorVisible.
 ^ self
 ].
 "/ key == #DeleteSpaces ifTrue:[
 (key == #Delete) ifTrue:[
-shifted ifTrue:[
+shiftPressed ifTrue:[
 [(cursorCol <= (self listAt:cursorLine) size)
 and:[self characterUnderCursor isSeparator]] whileTrue:[
 self makeCursorVisible.
 self deleteCharAtCursor.
 ].
 ^ startCol @ cursorLine
 ! !
 !EditTextView methodsFor:'selections'!
+addToSelectionAfter:aBlock
+"Pokud existuje selekce, upravi ji
+podle aktualni pozice kurzoru a pozice
+po provedeni blocku.
+Urceno k implementaci Shift-Home a Shift-End
+Nejak nevim, jak to presneji popsat :-)"
+|startLine startCol endLine endCol |
+self hasSelection ifTrue: [
+startLine := selectionStartLine .
+startCol := selectionStartCol .
+endLine := selectionEndLine .
+endCol := selectionEndCol .
+] ifFalse: [
+startLine := endLine :=  cursorLine .
+startCol := endCol := cursorCol .
+].
+"deselectim a provedu presun kurzoru..."
+self unselect .
+aBlock value .
+"funguje dost mizerne, jen na jednom radku..."
+(startCol - cursorCol) abs <= (endCol - cursorCol) abs
+ifTrue: [
+startCol := cursorCol.
+] ifFalse: [
+endCol := cursorCol - 1.
+].
+self selectFromLine:startLine col:startCol toLine: endLine col:endCol .
+!
 autoMoveCursorToEndOfSelection
 "return true, if the cursor should be automatically moved to the
 end of a selection.
 Redefined to return false in terminaViews, where the cursor should
 not be affected by selecting"
 ! !
 !EditTextView class methodsFor:'documentation'!
 version
-^ '$Header: /cvs/stx/stx/libwidg/EditTextView.st,v 1.356 2004-09-14 09:55:41 cg Exp $'
+^ '$Header: /cvs/stx/stx/libwidg/EditTextView.st,v 1.357 2004-09-14 10:39:31 cg Exp $'
 ! !

changeset 3023	9a6809da7351
parent 3020	68a2dfad4e5e
child 3024	e2d7e40e6481