hg/stx-libview: comparison WinWorkstation.st

equal deleted inserted replaced

-:89fa49dfd5e2
+:cb50d84d7cb4
+"{ Encoding: utf8 }"
 "
 COPYRIGHT (c) 1996 by Claus Gittinger
 All Rights Reserved
 This software is furnished under a license and may be used
 !
 Object subclass:#MonitorInfo
 	instanceVariableNames:'screenX screenY screenW screenH workX workY workW workH isPrimary
 		name'
+	classVariableNames:''
+	poolDictionaries:''
+	privateIn:WinWorkstation
+!
+Object subclass:#NativeFileDialogReturnData
+	instanceVariableNames:'targetFileOrDirectory multiSelectBaseNames selectedFilterIndex'
 	classVariableNames:''
 	poolDictionaries:''
 	privateIn:WinWorkstation
 !
 typedef struct fileDialogDataStruct {
 wchar_t filename[1000 * MAX_PATH]; // big buffer to support multiselect
 wchar_t directory[MAX_PATH];
 wchar_t title[MAX_PATH];
 HWND owningWindow;
-wchar_t filter[MAX_PATH];
+wchar_t filter[10 * MAX_PATH]; // there could be many filters
 int filterIndex;
 BOOL trueForSave;
 BOOL trueForMultiSelect;
 BOOL trueForPromptOverwrite;
 }
 hasResult = GetOpenFileNameW(&ofn);
 }
-if (!hasResult) {
+if (hasResult) {
+		pFdd->filterIndex = ofn.nFilterIndex;
+	} else {
 ZeroMemory(&pFdd->filename, sizeof(pFdd->filename));
 }
 pFdd->fileDialogDidReturn = TRUE;
 } else {
 sleep(0);
 }
 goto again;
 }
-/* fail evtl. sp�ter �ndern und in st verz�gert aufrufen
+/* fail evtl. später ändern und in st verzögert aufrufen
 */
 console_fprintf(stderr, "WinWorkstation [info]: UnregisterClass %s failed.\n",(char*)ev->ev_arg1);
 }
 free((char*)ev->ev_arg1);
 ev->ev_arg1 = 0;
 "opens a native windows file dialog,
 supports unicode 16 strings (like windows does it for filenames)
 returns nil or the full path to the selected file
 see example at the end of the method code"
-|dialogTitle defaultBaseName defaultDirectory owningViewId windowGroup filterString null
+|dialogTitle defaultBaseName defaultDirectory owningViewId windowGroup filterString filterArrayOrPairs
-dataAddressAndThreadAddress dataAddress returnValue|
+null filterStringParts
+dataAddressAndThreadAddress dataAddress returnValue
+nativeFileDialogReturnData targetFileOrDirectory multiSelectBaseNames selectedSuffixInfo selectedSuffix
+needsSlash|
 dialogTitleArg notEmptyOrNil ifTrue:[
 dialogTitle := dialogTitleArg asUnicode16String.
 ].
 owningViewId := owningTopView id.
 windowGroup := owningTopView windowGroup.
 ].
 filterStringOrArrayOfPairs notEmptyOrNil ifTrue:[
-filterStringOrArrayOfPairs isString ifTrue:[
+null := (String new:1)
-filterString := filterStringOrArrayOfPairs.
+at:1 put:Character null;
-] ifFalse:[
+yourself.
-null := (String new:1)
-at:1 put:Character null;
+filterStringOrArrayOfPairs notNil ifTrue:[
-yourself.
+filterStringOrArrayOfPairs isString ifTrue:[
+filterString := filterStringOrArrayOfPairs.
-filterString := ((filterStringOrArrayOfPairs
+filterArrayOrPairs := OrderedCollection new.
-collect:[:eachPair |
+filterStringParts := filterStringOrArrayOfPairs subStrings:null.
-eachPair first, null, eachPair second, null
-])
+1
-asStringWith:''), null.
+to:filterStringParts size
+by:2
+do:[:index |
+filterArrayOrPairs
+add:(Array
+with:(filterStringParts at:index)
+with:(filterStringParts at:index + 1)).
+].
+] ifFalse:[
+filterArrayOrPairs := filterStringOrArrayOfPairs.
+filterString := ((filterStringOrArrayOfPairs
+collect:[:eachPair |
+eachPair first, null, eachPair second, null
+])
+asStringWith:''), null.
+].
+filterString := filterString asUnicode16String.
 ].
-filterString := filterString asUnicode16String.
 ].
 [
 dataAddressAndThreadAddress := self
 primNativeFileDialogWithTitle:dialogTitle
 threadHandleAddress:dataAddressAndThreadAddress second.
 ].
 ].
 returnValue isEmptyOrNil ifTrue:[
+"dialog was aborted"
 ^ nil
 ].
-^ returnValue
+nativeFileDialogReturnData := returnValue.
+targetFileOrDirectory := nativeFileDialogReturnData targetFileOrDirectory.
+multiSelectBaseNames := nativeFileDialogReturnData multiSelectBaseNames.
+multiSelectBaseNames notEmptyOrNil ifTrue:[
+needsSlash := targetFileOrDirectory last ~= $\.
+^ (multiSelectBaseNames
+subStrings:$|)
+reject:[:each | each isEmptyOrNil]
+thenCollect:[:each |
+needsSlash ifTrue:[
+targetFileOrDirectory, '\', each
+] ifFalse:[
+targetFileOrDirectory, each
+]
+]
+].
+(filterArrayOrPairs notEmptyOrNil
+and:[targetFileOrDirectory asFilename suffix isEmptyOrNil]) ifTrue:[
+selectedSuffixInfo := filterArrayOrPairs
+at:nativeFileDialogReturnData selectedFilterIndex
+ifAbsent:nil.
+selectedSuffixInfo notNil ifTrue:[
+selectedSuffix := (selectedSuffixInfo second
+subStrings:'.')
+lastIfEmpty:nil.
+(selectedSuffix notNil
+and:[selectedSuffix ~= '*']) ifTrue:[
+^ targetFileOrDirectory, '.', selectedSuffix
+].
+].
+].
+^ targetFileOrDirectory
 "
 ########### example1 without owning view ##########
 |null|
 'expecco Testsuite', null, '*.ets', null,
 'expecco Logfile', null, '*.elf', null,
 'All', null, '*.*', null,
 null
 filterIndex:3
-trueForSave:false
+trueForSave:true
 trueForMultiSelect:nil
 trueForPromptOverwrite:nil
 ########### example2 without owning view and termination ##########
 p terminate.
 "
 "Created: / 25-10-2018 / 10:54:52 / sr"
-"Modified: / 26-10-2018 / 09:35:38 / sr"
+"Modified: / 26-10-2018 / 13:48:31 / sr"
 !
 primCloseNativeFileDialogByDataAddress:dataAddress
 threadHandleAddress:threadHandleAddress
 primGetNativeFileDialogResultByDataAddress:dataAddress
 "returns nil if the native file dialog is still open
 returns an empty string if the file dialog was canceled
 returns the full path to the user selected file"
-|targetFileOrNil multiSelectValues needsSlash|
+|targetFileOrNil multiSelectValues selectedFilterIndex
+nativeFileDialogReturnData|
 %{  /* STACK: 100000 */
 if (__isExternalAddress(dataAddress)) {
 fileDialogData *pFdd = __externalAddressVal(dataAddress);
 if (pFdd->fileDialogDidReturn) {
 targetFileOrNil = __MKU16STRING(pFdd->filename);
-if ((!pFdd->trueForSave) && pFdd->trueForMultiSelect) {
+if (pFdd->trueForSave) {
-			    int len;
+selectedFilterIndex = __MKINT(pFdd->filterIndex);
-				int pos;
+} else {
+if (pFdd->trueForMultiSelect) {
-wchar_t buffer[1000 * MAX_PATH]; // big buffer to support multiselect
+int len;
-ZeroMemory(buffer, sizeof(buffer));
+int pos;
-len = wcslen(pFdd->filename);
+wchar_t buffer[1000 * MAX_PATH]; // big buffer to support multiselect
-pos = len + 1;
+ZeroMemory(buffer, sizeof(buffer));
-while ((len = wcslen(&pFdd->filename[pos])) > 0) {
+len = wcslen(pFdd->filename);
-wcscat(buffer, &pFdd->filename[pos]);
+pos = len + 1;
-wcscat(buffer, L"|");
-pos = pos + len + 1;
+while ((len = wcslen(&pFdd->filename[pos])) > 0) {
-wprintf(L"char '%ls'\n", buffer);
+wcscat(buffer, &pFdd->filename[pos]);
+wcscat(buffer, L"|");
+pos = pos + len + 1;
+wprintf(L"char '%ls'\n", buffer);
+}
+multiSelectValues = __MKU16STRING(buffer);
 }
-multiSelectValues = __MKU16STRING(buffer);
 }
 free(pFdd);
 }
 }
 targetFileOrNil isNil ifTrue:[
 ^ nil
 ].
 targetFileOrNil isEmpty ifTrue:[
-^ ''
+^ '' "/ to exit the while nil loop (indicated file dialog abort)
 ].
-multiSelectValues isEmptyOrNil ifTrue:[
-^ targetFileOrNil
+^ NativeFileDialogReturnData new
-].
+targetFileOrDirectory:targetFileOrNil;
+multiSelectBaseNames:multiSelectValues;
-needsSlash := targetFileOrNil last ~= $\.
+selectedFilterIndex:selectedFilterIndex;
+yourself
-^ (multiSelectValues
-subStrings:$|)
+"Modified (comment): / 26-10-2018 / 13:34:50 / sr"
-reject:[:each | each isEmptyOrNil]
-thenCollect:[:each |
-needsSlash ifTrue:[
-targetFileOrNil, '\', each
-] ifFalse:[
-targetFileOrNil, each
-].
-]
 !
 primNativeFileDialogWithTitle:dialogTitle
 defaultBaseName:defaultBaseName
 defaultDirectory:defaultDirectory
 RETURN (self);
 }
 }
 %}
 "
-(StandardSystemView new label:'���') open
+(StandardSystemView new label:'äöü') open
 "
 !
 setWindowShapeEllipticalX:x Y:y width:w height:h in:aWindowId
 "set the windows shape to an elliptical region"
 workY
 ^ workY
 ! !
+!WinWorkstation::NativeFileDialogReturnData class methodsFor:'documentation'!
+documentation
+"
+This class is used for the native file dialog.
+Its just a better Dictionary to collect all required return data from the native file dialog
+[author:]
+sr
+[instance variables:]
+[class variables:]
+[see also:]
+"
+! !
+!WinWorkstation::NativeFileDialogReturnData methodsFor:'accessing'!
+multiSelectBaseNames
+"when multiselect is on, here are the baseNames collected,
+their directory is kept in targetFileOrDirectory"
+^ multiSelectBaseNames
+"Modified (comment): / 26-10-2018 / 13:30:04 / sr"
+!
+multiSelectBaseNames:something
+"when multiselect is on, here are the baseNames collected,
+their directory is kept in targetFileOrDirectory"
+multiSelectBaseNames := something.
+"Modified (comment): / 26-10-2018 / 13:30:09 / sr"
+!
+selectedFilterIndex
+"this is the index of the filter, which was selected by user (1 based).
+only present when save (not open)"
+^ selectedFilterIndex
+"Modified (comment): / 26-10-2018 / 13:30:48 / sr"
+!
+selectedFilterIndex:something
+"this is the index of the filter, which was selected by user (1 based).
+only present when save (not open)"
+selectedFilterIndex := something.
+"Modified (comment): / 26-10-2018 / 13:30:55 / sr"
+!
+targetFileOrDirectory
+"the selected file or when mutliselect the directory"
+^ targetFileOrDirectory
+"Modified (comment): / 26-10-2018 / 13:31:13 / sr"
+!
+targetFileOrDirectory:something
+"the selected file or when mutliselect the directory"
+targetFileOrDirectory := something.
+"Modified (comment): / 26-10-2018 / 13:31:16 / sr"
+! !
 !WinWorkstation::PrinterDeviceContextHandle class methodsFor:'documentation'!
 documentation
 "
 This is used as a finalization handle for printer contexts

changeset 8555	cb50d84d7cb4
parent 8554	89fa49dfd5e2
child 8561	c1e521864ad4