hg/stx-libwidg: comparison EditTextView.st

equal deleted inserted replaced

-:d9c981028573
+:4fca96a61d42
 (key == #CursorRight) ifTrue:[
 (shifted and:[selectionStartLine isNil]) ifTrue:[
 selectionStartLine := selectionEndLine := clickStartLine := cursorLine.
 selectionStartCol := selectionEndCol := clickStartCol := cursorCol.
+cursorCol := cursorCol + 1.
 expandingTop := false.
 self validateNewSelection.
 self setPrimarySelection.
 self selectionChanged.
 self redrawLine:selectionStartLine.
 ^ self.
 ].
-selectionStartLine notNil ifTrue:[
+self cursorMovementAllowed ifTrue:[
-self cursorMovementAllowed ifTrue:[
+shifted ifTrue:[
-"/
+self addToSelectionAfter:[ self cursorRight ]
-"/ treat the whole selection as cursor
+] ifFalse:[
-"/
-self setCursorLine:(selectionEndLine ? selectionStartLine).
-selectionEndCol == 0 ifTrue:[
-selectionEndCol := 1.
-].
-self setCursorCol:selectionEndCol.
-shifted ifTrue:[
-self expandSelectionRight.
-^ self
-].
 self unselect; makeCursorVisible.
-cursorCol == 1 ifTrue:[^ self].
+self cursorRight.
 ].
 ].
-self cursorRight.
 ^ self
 ].
 (key == #CursorDown) ifTrue:[
 (shifted and:[selectionStartLine isNil]) ifTrue:[
 selectionStartLine := clickStartLine := cursorLine. selectionEndLine := cursorLine + 1.
-selectionStartCol := clickStartCol := selectionEndCol := cursorCol.
+selectionStartCol := clickStartCol := cursorCol.
+selectionEndCol := cursorCol - 1.
 selectionEndCol == 1 ifTrue:[
 selectionEndCol := 0.
 ].
+self setCursorLine: cursorLine + 1.
 self validateNewSelection.
 self selectionChanged.
 self redrawLine:selectionStartLine.
 expandingTop := false.
 self redrawLine:selectionEndLine.
 selectionStartLine notNil ifTrue:[
 self cursorMovementAllowed ifTrue:[
 "/
 "/ treat the whole selection as cursor
 "/
-self setCursorLine:(selectionEndLine ? selectionStartLine).
+"/                self setCursorLine:(selectionEndLine ? selectionStartLine).
-self setCursorCol:selectionStartCol.
+"/                self setCursorCol:selectionStartCol.
-(cursorCol == 0 or:[selectionEndCol == 0]) ifTrue:[
+"/                (cursorCol == 0 or:[selectionEndCol == 0]) ifTrue:[
-self setCursorCol:1.
+"/                    self setCursorCol:1.
-self setCursorLine:(cursorLine - 1).
+"/                    self setCursorLine:(cursorLine - 1).
-].
+"/                ].
-self makeCursorVisible.
+"/                self makeCursorVisible.
+"/
-shifted ifTrue:[
+"/                shifted ifTrue:[
-clickLine := cursorLine.
+"/                    clickLine := cursorLine.
-clickCol := cursorCol.
+"/                    clickCol := cursorCol.
-self expandSelectionDown.
+"/                    self setCursorLine: cursorLine + 1.
-^ self
+"/                    self expandSelectionDown.
-].
+"/                    ^ self
-self unselect.
+"/                ].
+"/                self unselect.
 ].
 ].
+self cursorMovementAllowed ifTrue:[
 n := 1 + (self sensor compressKeyPressEventsWithKey:#CursorDown).
-self cursorDown:n.
+shifted ifTrue:[
-"/
+self addToSelectionAfter:[ self cursorDown:n ]
-"/ flush keyboard to avoid runaway cursor
+] ifFalse:[
-"/
+self unselect; makeCursorVisible.
-self sensor flushKeyboardFor:self.
+self cursorDown:n.
+].
+"/
+"/ flush keyboard to avoid runaway cursor
+"/
+self sensor flushKeyboardFor:self.
+].
 ^ self
 ].
 (key == #CursorLeft or:[key == #CursorUp]) ifTrue:[
 (shifted and:[selectionStartLine isNil]) ifTrue:[
 expandingTop := true.
 key == #CursorLeft ifTrue:[
 cursorCol > 1 ifTrue:[
 selectionStartLine := selectionEndLine := clickStartLine := cursorLine.
 selectionEndCol := clickStartCol := cursorCol-1.
 selectionStartCol := cursorCol-1.
+self setCursorCol: cursorCol-1.
 self validateNewSelection.
 self selectionChanged.
 self redrawLine:selectionStartLine.
 ^ self
 ]
 ] ifFalse:[
 cursorLine > 1 ifTrue:[
 selectionEndLine := clickStartLine := cursorLine.
-selectionEndCol := selectionStartCol := clickStartCol := cursorCol.
+selectionStartCol := clickStartCol := cursorCol.
+selectionEndCol := cursorCol - 1.
 selectionStartLine := cursorLine - 1.
 selectionEndCol == 1 ifTrue:[
 selectionEndCol := 0.
 ].
 self validateNewSelection.
 self selectionChanged.
 self redrawFromLine:selectionStartLine to:cursorLine.
+self setCursorLine: cursorLine - 1.
 ^ self
 ]
 ]
 ].
-selectionStartLine notNil ifTrue:[
+self hasSelection ifTrue:[
 self cursorMovementAllowed ifTrue:[
 "/
 "/ treat the whole selection as cursor
 "/
-self setCursorLine:selectionStartLine.
+"/                self setCursorLine:selectionStartLine.
-self setCursorCol:selectionStartCol.
+"/                self setCursorCol:selectionStartCol.
-(key == #CursorLeft) ifTrue:[
-self setCursorCol:(cursorCol+1).  "/ compensate for followup crsr-left
-].
 self makeCursorVisible.
-shifted ifTrue:[
+"/                shifted ifFalse:[
-(key == #CursorUp) ifTrue:[
+"/                    self unselect.
-clickLine := cursorLine.
+"/                ]
-self expandSelectionUp.
-] ifFalse:[
-self expandSelectionLeft.
-].
-^ self
-].
-self unselect.
 ].
 ].
 (key == #CursorLeft) ifTrue:[
-self cursorLeft. ^self
+shifted ifTrue:[
-].
+self addToSelectionAfter:[self cursorLeft].
-(key == #CursorUp)        ifTrue:[
+] ifFalse:[
+self unselect; makeCursorVisible.
+self cursorLeft.
+].
+^self
+].
+(key == #CursorUp) ifTrue:[
 n := 1 + (self sensor compressKeyPressEventsWithKey:#CursorUp).
-self cursorUp:n.
+shifted ifTrue:[
+self addToSelectionAfter: [ self cursorUp:n ]
+] ifFalse:[
+self unselect; makeCursorVisible.
+self cursorUp:n.
+].
 "/
 "/ flush keyboard to avoid runaway cursor
 "/
 self sensor flushKeyboardFor:self.
 ^ self
 ].
 ].
-"Modified: / 17-04-2012 / 21:01:15 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+"Modified: / 28-08-2013 / 01:08:25 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 doKeyPress:key x:x y:y
 "handle keyboard input"
 shiftPressed ifTrue: [
 "/ "Original St/X code - now use Ctrl modifier"
 "/ self unselect.
 "/ self cursorHome.
 "Jan's modification"
-"/ self addToSelectionAfter:[ self cursorToBeginOfLine ].
+self addToSelectionAfter:[ self cursorToBeginOfLine ].
 "/ Jan's modification modified by his own request ;-))
-self selectFromBeginOfLine.
+"/ JV: Well, does not work correctly. Better to fix addToSelectionAfter:
+"/ self selectFromBeginOfLine.
 ] ifFalse: [
 self unselect.
 ctrlPressed ifTrue:[
 self cursorHome.
 ] ifFalse:[
 shiftPressed ifTrue:[
 "/ "Original St/X code - now use Ctrl modifier"
 "/ self unselect.
 "/ self cursorToBottom
 " Jan's modification"
-"/ self addToSelectionAfter:[ self cursorToEndOfLine ] .
+self addToSelectionAfter:[ self cursorToEndOfLine ] .
 "/ Jan's modification modified by his own request ;-))
-self selectToEndOfLine.
+"/ JV: Well, does not work correctly. Better to fix addToSelectionAfter:
+"/  self selectToEndOfLine.
 ] ifFalse:[
 self unselect.
 ctrlPressed ifTrue:[
 self cursorToBottom
 ] ifFalse:[
 super keyPress:key x:x y:y
 "Modified: / 06-02-1998 / 11:59:59 / stefan"
 "Modified: / 14-07-2011 / 12:08:28 / cg"
+"Modified: / 26-08-2013 / 17:50:25 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 executeKeyboardMacro:cmdMacro
 Error handle:[:ex |
 	self warn:'Error in keyboard macro: ' , ex description.
 ! !
 !EditTextView methodsFor:'selections'!
 addToSelectionAfter:aBlock
+"Extends the selection accroding to cursor position
+after evaluation of `aBlock`. Used to implement
+Shift-Home & Shift-End. "
+"/ Following comment is in czech and thus now very useful.
+"/ However I (JV) keep it here as this is one of the very
+"/ first fix/hack we made to Smalltalk/X ages ago, if not
+"/ the very first one. Actually, this method and comment was
+"/ written by Martin Dvorak. Yeah, being bit nostalgic...
 "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 |
+| startLine startCol endLine endCol curLine curCol cursorAtTheBeginning cursorAtTheEnd cursorWasShown |
+curLine := cursorLine.
+curCol := cursorCol.
 self hasSelection ifTrue: [
-	startLine := selectionStartLine .
+startLine := selectionStartLine .
-	startCol := selectionStartCol .
+startCol := selectionStartCol .
-	endLine := selectionEndLine .
+endLine := selectionEndLine .
-	endCol := selectionEndCol .
+endCol := selectionEndCol .
-] ifFalse: [
+] ifFalse:[
-	startLine := endLine :=  cursorLine .
+startLine := endLine := curLine.
-	startCol := endCol := cursorCol .
+startCol := curCol.
-].
+endCol := curCol - 1.
+].
-"deselectim a provedu presun kurzoru..."
-self unselect .
-aBlock value .
+cursorAtTheBeginning := (startLine == curLine) and:[startCol == curCol].
+cursorAtTheEnd := (endLine == curLine) and:[endCol == (curCol - 1)].
-"funguje dost mizerne, jen na jednom radku..."
-(startCol - cursorCol) abs <= (endCol - cursorCol) abs
+self assert: cursorAtTheBeginning | cursorAtTheEnd.
-	ifTrue: [
-	    startCol := cursorCol.
-	] ifFalse: [
+cursorWasShown := self hideCursor.
-	    endCol := cursorCol - 1.
+aBlock value.
-	].
+cursorAtTheBeginning ifTrue:[
+(cursorCol == (endCol + 1) and:[cursorLine == endLine]) ifTrue:[
+self unselect; showCursor.
+^self
+].
+(cursorLine > endLine or:[cursorLine == endLine and:[cursorCol > endCol]]) ifTrue:[
+startLine := endLine.
+startCol := endCol + 1.
+endLine := cursorLine.
+endCol := cursorCol - 1
+] ifFalse:[
+startLine := cursorLine.
+startCol := cursorCol.
+]
+] ifFalse:[
+cursorAtTheEnd ifTrue:[
+(cursorCol == startCol and:[cursorLine == startLine]) ifTrue:[
+self unselect; showCursor.
+^self
+].
+(cursorLine < startLine or:[cursorLine == startLine and:[cursorCol < startCol]]) ifTrue:[
+endLine := startLine.
+endCol := startCol - 1.
+startLine := cursorLine.
+startCol := cursorCol
+] ifFalse:[
+endLine := cursorLine.
+endCol := cursorCol - 1.
+]
+].
+].
 self selectFromLine:startLine col:startCol toLine: endLine col:endCol .
+cursorWasShown ifTrue:[self showCursor].
+"Modified: / 28-08-2013 / 01:23:06 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 autoMoveCursorToEndOfSelection
 "return true, if the cursor should be automatically moved to the
 end of a selection.
 	typeOfSelection := nil
 ]
 !
 selectFromLine:startLine col:startCol toLine:endLine col:endCol
-"when a range is selected, position the cursor behind the selection
-for easier editing. Also typeOfSelection is nilled here."
 super selectFromLine:startLine col:startCol toLine:endLine col:endCol.
-(selectionEndLine notNil and:[self autoMoveCursorToEndOfSelection]) ifTrue:[
+"JV: That's atctuall rubbish as then you loose the original positon
-	self cursorLine:selectionEndLine col:(selectionEndCol + 1).
+and if user wants to extend/shring the selection further, you don't know
-].
+from which end to do it!!"
+"/    (selectionEndLine notNil and:[self autoMoveCursorToEndOfSelection]) ifTrue:[
+"/        self cursorLine:selectionEndLine col:(selectionEndCol + 1).
+"/    ].
 typeOfSelection := nil
+"Modified: / 27-08-2013 / 13:28:12 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+"Modified (comment): / 27-08-2013 / 15:58:19 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 selectToEndOfLine
 "select the text from the current cursor position to the end of the current line"

branch	text-view-selection-refactoring
changeset 4841	4fca96a61d42
parent 4674	935f7e07003b
child 4843	7cd827899263