hg/stx-libtool: comparison FileBrowser.st

equal deleted inserted replaced

-:48cd793d8eb4
+:9bf0c15113f2
 StandardSystemView subclass:#FileBrowser
 	 instanceVariableNames:'labelView filterField fileListView subView currentDirectory
 		fileList checkBlock checkDelta timeOfLastCheck showLongList
 		showVeryLongList showDotFiles myName killButton compressTabs
 		lockUpdate previousDirectory currentFileName timeOfFileRead
-		tabSpec'
+		tabSpec commandView commandIndex'
-	 classVariableNames:'DirectoryHistory DirectoryHistoryWhere HistorySize DefaultIcon'
+	 classVariableNames:'DirectoryHistory DirectoryHistoryWhere HistorySize DefaultIcon
+			     CommandHistory CommandHistorySize'
 	 poolDictionaries:''
 	 category:'Interface-Browsers'
 !
 FileBrowser comment:'
 COPYRIGHT (c) 1991 by Claus Gittinger
 	      All Rights Reserved
-$Header: /cvs/stx/stx/libtool/FileBrowser.st,v 1.47 1995-08-29 23:46:46 claus Exp $
+$Header: /cvs/stx/stx/libtool/FileBrowser.st,v 1.48 1995-09-07 12:53:25 claus Exp $
 '!
 !FileBrowser class methodsFor:'documentation'!
 copyright
 "
 !
 version
 "
-$Header: /cvs/stx/stx/libtool/FileBrowser.st,v 1.47 1995-08-29 23:46:46 claus Exp $
+$Header: /cvs/stx/stx/libtool/FileBrowser.st,v 1.48 1995-09-07 12:53:25 claus Exp $
 "
 !
 documentation
 "
 showDotFiles := resources at:'SHOW_DOT_FILES' default:false.
 lockUpdate := false.
+CommandHistory isNil ifTrue:[
+	CommandHistory := OrderedCollection new.
+	CommandHistorySize := 50
+].
 DirectoryHistory isNil ifTrue:[
 	DirectoryHistory := OrderedCollection new.
 	DirectoryHistoryWhere := OrderedCollection new.
 	HistorySize := 15.
 ].
+commandIndex := 0.
 myName := (resources string:self class name).
 self label:myName.
 labelFrame := View
 killButton := Button label:(resources string:'kill') in:self.
 killButton origin:(halfSpacing @ halfSpacing)
 	       extent:(killButton width @ filterField height).
 killButton hiddenOnRealize:true.
-frame := VariableVerticalPanel
+self initializeCommandViewIn:self.
-		 origin:[frame borderWidth negated
-			 @
+"/    frame := VariableVerticalPanel
-			 labelFrame height
+"/                 origin:[frame borderWidth negated
-			 "/ (labelView height + labelView origin y + spacing)
+"/                         @
-			]
+"/                         labelFrame height
-		 corner:(1.0 @ 1.0)
+"/                         "/ (labelView height + labelView origin y + spacing)
-		     in:self.
+"/                        ]
+"/                 corner:(1.0 @ 1.0)
+"/                     in:self.
+frame := VariableVerticalPanel origin:0.0@0.0 corner:1.0@1.0 in:self.
+frame topInset:labelFrame height.
+commandView notNil ifTrue:[
+	frame bottomInset:(commandView height + spacing)
+].
 topFrame := ScrollableView for:SelectionInListView in:frame.
 topFrame origin:(0.0 @ 0.0) corner:(1.0 @ 0.3).
 fileListView := topFrame scrolledView.
 					      self fileGet].
 fileListView multipleSelectOk:true.
 fileListView menuHolder:self; menuPerformer:self; menuMessage:#fileListMenu.
 v := self initializeSubViewIn:frame.
 v origin:(0.0 @ 0.3) corner:(1.0 @ 1.0).
 subView := v scrolledView.
 (subView respondsTo:#directoryForFileDialog:) ifTrue:[
 	subView directoryForFileDialog:currentDirectory
 ].
 ObjectMemory addDependent:self.
+"Modified: 6.9.1995 / 20:26:06 / claus"
 !
 initializeFilterPattern
 "set an initial matchpattern - can be redefined in subclasses"
 different view types (SoundFileBrowser/ImageBrowsers etc.)"
 ^ HVScrollableView for:CodeView miniScrollerH:true miniScrollerV:false in:frame.
 !
+initializeCommandViewIn:frame
+"set up the command view - can be redefined in subclasses as empty,
+if no commandView is wanted"
+commandView := EditField origin:0.0@1.0 corner:1.0@1.0 in:frame.
+commandView topInset:(commandView preferredExtent y negated - ViewSpacing).
+commandView bottomInset:ViewSpacing.
+commandView horizontalInset:ViewSpacing.
+commandView contents:'** no commands which require input here **'.
+commandView entryCompletionBlock:[
+	FilenameEditField filenameCompletionBlock
+		value:commandView
+		value:currentDirectory pathName asFilename
+		value:false
+		value:false
+].
+commandView leaveAction:[:key |
+	|cmd nCmd empty|
+	(key == #CursorDown
+	or:[key == #CursorUp]) ifTrue:[
+nCmd := CommandHistory size.
+nCmd == 0 ifTrue:[
+empty := true
+] ifFalse:[
+key == #CursorUp ifTrue:[
+commandIndex == nCmd ifTrue:[
+commandView flash.
+].
+commandIndex := (commandIndex + 1) min:nCmd
+] ifFalse:[
+commandIndex == 1 ifTrue:[
+commandView flash.
+empty := true.
+].
+commandIndex := (commandIndex - 1) max:1.
+].
+].
+empty == true ifTrue:[
+commandView contents:nil
+] ifFalse:[
+commandView contents:(CommandHistory at:commandIndex).
+]
+	].
+	key == #Return ifTrue:[
+	    cmd := commandView contents.
+	    subView insertStringAtCursor:'>> '.
+	    subView insertStringAtCursor:cmd.
+	    subView insertCharAtCursor:(Character cr).
+	    (cmd notNil and:[cmd notEmpty]) ifTrue:[
+		CommandHistory notNil ifTrue:[
+		    CommandHistory addFirst:cmd.
+		    CommandHistory size > CommandHistorySize ifTrue:[
+			CommandHistory removeLast
+		    ]
+		].
+		self doExecuteCommand:cmd replace:false.
+		commandView contents:nil.
+		commandIndex := 0
+	    ]
+	]
+].
+"Modified: 7.9.1995 / 11:43:55 / claus"
+!
 currentDirectory:aDirectoryPath
 "set the directory to be browsed"
 currentDirectory := FileDirectory directoryNamed:aDirectoryPath.
 self changed:#path.
 !
 focusSequence
 "return the sequence in which ALT-CursorRight steps focus"
-^ Array with:filterField with:fileListView with:subView
+|fs|
+fs := Array
+	with:filterField
+	with:fileListView
+	with:subView.
+commandView notNil ifTrue:[
+	fs := fs copyWith:commandView
+].
+^fs
 ! !
 !FileBrowser methodsFor:'events'!
 visibilityChange:how
 aComponent == filterField ifTrue:[
 	s := 'HELP_FILTER'
 ].
 aComponent == labelView ifTrue:[
 	s := 'HELP_PATHFIELD'
+].
+aComponent == commandView ifTrue:[
+	s := 'HELP_COMMANDVIEW'
 ].
 s notNil ifTrue:[
 	^ resources string:s
 ].
 ^ nil
 		myProcess := Processor activeProcess.
 		myPriority := myProcess priority.
 		myProcess priority:(Processor userBackgroundPriority).
 		[
-		    |codeView|
+		    |codeView lines|
 		    codeView := subView.
 		    replace ifTrue:[
 			codeView list:nil.
 		    [stream atEnd] whileFalse:[
 			(stream readWaitWithTimeoutMs:250) ifFalse:[
 			    "
 			     data available
 			    "
+			    lines := OrderedCollection new:50.
 			    line := stream nextLine.
+			    line notNil ifTrue:[lines add:line].
+			    [stream atEnd not
+			    and:[stream canReadWithoutBlocking
+			    and:[lines size < 50]]] whileTrue:[
+				line := stream nextLine.
+				line notNil ifTrue:[lines add:line].
+			    ].
 			    "
 			     need this critical section; otherwise,
 			     we could get the signal while waiting for
 			     an expose event ...
 			    "
 			    access critical:[
-				line notNil ifTrue:[
+				lines size > 0 ifTrue:[
-				    line := line withTabsExpanded.
 				    replace ifTrue:[
-					codeView at:lnr put:line.
+					lines do:[:line |
-					codeView cursorToBottom; cursorDown.
+					    codeView at:lnr put:line withTabsExpanded.
-					lnr := lnr + 1.
+					    codeView cursorToBottom; cursorDown.
+					    lnr := lnr + 1.
+					].
 				    ] ifFalse:[
-					codeView insertStringAtCursor:line.
+codeView insertLines:lines before:codeView cursorLine.
-					codeView insertCharAtCursor:(Character cr).
+codeView cursorDown:lines size.
+"/ lines do:[:line |
+"/     codeView insertLine:line withTabsExpanded before:codeView cursorLine.
+"/     codeView cursorDown.
+"/ ]
+"/                                        codeView insertStringAtCursor:line.
+"/                                        codeView insertCharAtCursor:(Character cr).
 				    ]
 				].
 			    ].
 			].
 	"
 	 clear its action (actually not needed, but
 	 releases reference to thisContext earlier)
 	"
 	killButton action:nil.
-]
+].
+subView size > 10000 ifTrue:[
+	self warn:'text quite large now - please cut off some lines'
+]
+"Modified: 6.9.1995 / 20:56:15 / claus"
 !
 initialCommandFor:fileName into:aBox
 "set a useful initial command for execute box.
 	fileName := fileList at:sel first
 ].
 fileName notNil ifTrue:[
 	self initialCommandFor:fileName into:box.
 ].
+box directory:currentDirectory pathName asFilename.
 box showAtPointer
+"Modified: 7.9.1995 / 10:31:54 / claus"
 !
 selectedFilesDo:aBlock
 "evaluate aBlock on all selected files;
 show a wait cursor while doing this"
 !
 fileFileInLazy:lazy
 "fileIn the selected file(s)"
-|aStream upd here oldPath wasLazy|
+|aStream here oldPath wasLazy|
 self selectedFilesDo:[:fileName |
 	((currentDirectory typeOf:fileName) == #regular) ifTrue:[
 	    here := currentDirectory pathName.
 		    ObjectFileLoader loadObjectFile:(here , '/' ,fileName)
 		]
 	    ] ifFalse:[
 		aStream := FileStream readonlyFileNamed:fileName in:currentDirectory.
 		aStream isNil ifFalse:[
-		    upd := Class updateChanges:false.
 		    [
-			oldPath := Smalltalk systemPath.
+			Class withoutUpdatingChangesDo:[
-			Smalltalk systemPath:(oldPath copy addFirst:here; yourself).
+			    oldPath := Smalltalk systemPath.
-			wasLazy := Compiler compileLazy:lazy.
+			    Smalltalk systemPath:(oldPath copy addFirst:here; yourself).
-			aStream fileIn.
+			    wasLazy := Compiler compileLazy:lazy.
+			    aStream fileIn.
+			]
 		    ] valueNowOrOnUnwindDo:[
 			Compiler compileLazy:wasLazy.
 			Smalltalk systemPath:oldPath.
-			Class updateChanges:upd.
 			aStream close
 		    ]
 		]
 	    ]
 	]

changeset 132	9bf0c15113f2
parent 126	fca75dda31db
child 133	fa9a37e36a07