Merge pull request #1743 from attilaz/filedialog

File dialog added to entry
This commit is contained in:
Бранимир Караџић 2019-04-25 18:57:21 -07:00 committed by GitHub
commit fcfc26c482
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 373 additions and 197 deletions

View File

@ -0,0 +1,206 @@
/*
* Copyright 2010-2019 Branimir Karadzic. All rights reserved.
* License: https://github.com/bkaradzic/bgfx#license-bsd-2-clause
*/
#include <bx/allocator.h>
#include <bx/filepath.h>
#include <bx/string.h>
#include <bx/readerwriter.h>
#include <bx/process.h>
#include "dialog.h"
#if BX_PLATFORM_WINDOWS
extern "C" void* __stdcall GetModuleHandleA(const char* _moduleName);
extern "C" uint32_t __stdcall GetModuleFileNameA(void* _module, char* _outFilePath, uint32_t _size);
typedef uintptr_t (__stdcall *LPOFNHOOKPROC)(void*, uint32_t, uintptr_t, uint64_t);
struct OPENFILENAMEA
{
uint32_t structSize;
void* hwndOwner;
void* hinstance;
const char* filter;
const char* customFilter;
uint32_t maxCustomFilter;
uint32_t filterIndex;
const char* file;
uint32_t maxFile;
const char* fileTitle;
uint32_t maxFileTitle;
const char* initialDir;
const char* title;
uint32_t flags;
uint16_t fileOffset;
uint16_t fileExtension;
const char* defExt;
uintptr_t customData;
LPOFNHOOKPROC hook;
const char* templateName;
void* reserved0;
uint32_t reserved1;
uint32_t flagsEx;
};
extern "C" bool __stdcall GetOpenFileNameA(OPENFILENAMEA* _ofn);
#endif // BX_PLATFORM_WINDOWS
class Split
{
public:
Split(const bx::StringView& _str, char _ch)
: m_str(_str)
, m_token(_str.getPtr(), bx::strFind(_str, _ch).getPtr() )
, m_ch(_ch)
{
}
bx::StringView next()
{
bx::StringView result = m_token;
m_token = bx::strTrim(
bx::StringView(m_token.getTerm()+1
, bx::strFind(bx::StringView(m_token.getTerm()+1, m_str.getTerm() ), m_ch).getPtr() )
, " \t\n"
);
return result;
}
bool isDone() const
{
return m_token.isEmpty();
}
private:
const bx::StringView& m_str;
bx::StringView m_token;
char m_ch;
};
#if !BX_PLATFORM_OSX
bool openFileSelectionDialog(
bx::FilePath& _inOutFilePath
, FileSelectionDialogType::Enum _type
, const bx::StringView& _title
, const bx::StringView& _filter
)
{
#if BX_PLATFORM_LINUX
char tmp[4096];
bx::StaticMemoryBlockWriter writer(tmp, sizeof(tmp) );
bx::Error err;
bx::write(&writer, &err
, "--file-selection%s --title \"%.*s\" --filename \"%s\""
, FileSelectionDialogType::Save == _type ? " --save" : ""
, _title.getLength(), _title.getPtr()
, _inOutFilePath.getCPtr()
);
for (bx::LineReader lr(_filter); !lr.isDone();)
{
const bx::StringView line = lr.next();
bx::write(&writer, &err
, " --file-filter \"%.*s\""
, line.getLength(), line.getPtr()
);
}
if (err.isOk() )
{
bx::ProcessReader pr;
if (bx::open(&pr, "zenity", tmp, &err) )
{
char buffer[1024];
int32_t total = bx::read(&pr, buffer, sizeof(buffer), &err);
bx::close(&pr);
if (0 == pr.getExitCode() )
{
_inOutFilePath.set(bx::strRTrim(bx::StringView(buffer, total), "\n\r") );
return true;
}
}
}
#elif BX_PLATFORM_WINDOWS
BX_UNUSED(_type);
char out[bx::kMaxFilePath] = { '\0' };
OPENFILENAMEA ofn;
bx::memSet(&ofn, 0, sizeof(ofn) );
ofn.structSize = sizeof(OPENFILENAMEA);
ofn.initialDir = _inOutFilePath.getCPtr();
ofn.file = out;
ofn.maxFile = sizeof(out);
ofn.flags = 0
| /* OFN_EXPLORER */ 0x00080000
| /* OFN_FILEMUSTEXIST */ 0x00001000
| /* OFN_DONTADDTORECENT */ 0x02000000
;
char tmp[4096];
bx::StaticMemoryBlockWriter writer(tmp, sizeof(tmp) );
bx::Error err;
ofn.title = tmp;
bx::write(&writer, &err, "%.*s", _title.getLength(), _title.getPtr() );
bx::write(&writer, '\0', &err);
ofn.filter = tmp + uint32_t(bx::seek(&writer) );
for (bx::LineReader lr(_filter); !lr.isDone() && err.isOk();)
{
const bx::StringView line = lr.next();
const bx::StringView sep = bx::strFind(line, '|');
if (!sep.isEmpty() )
{
bx::write(&writer, bx::strTrim(bx::StringView(line.getPtr(), sep.getPtr() ), " "), &err);
bx::write(&writer, '\0', &err);
bool first = true;
for (Split split(bx::strTrim(bx::StringView(sep.getPtr()+1, line.getTerm() ), " "), ' '); !split.isDone() && err.isOk();)
{
const bx::StringView token = split.next();
if (!first)
{
bx::write(&writer, ';', &err);
}
first = false;
bx::write(&writer, token, &err);
}
bx::write(&writer, '\0', &err);
}
else
{
bx::write(&writer, line, &err);
bx::write(&writer, '\0', &err);
bx::write(&writer, '\0', &err);
}
}
bx::write(&writer, '\0', &err);
if (err.isOk()
&& GetOpenFileNameA(&ofn) )
{
_inOutFilePath.set(ofn.file);
return true;
}
#else
BX_UNUSED(_inOutFilePath, _type, _title, _filter);
#endif // BX_PLATFORM_LINUX
return false;
}
#endif !BX_PLATFORM_OSX

View File

@ -0,0 +1,30 @@
/*
* Copyright 2010-2019 Branimir Karadzic. All rights reserved.
* License: https://github.com/bkaradzic/bgfx#license-bsd-2-clause
*/
#ifndef DIALOG_H_HEADER_GUARD
#define DIALOG_H_HEADER_GUARD
namespace bx { class FilePath; class StringView; }
struct FileSelectionDialogType
{
enum Enum
{
Open,
Save,
Count
};
};
bool openFileSelectionDialog(
bx::FilePath& _inOutFilePath
, FileSelectionDialogType::Enum _type
, const bx::StringView& _title
, const bx::StringView& _filter = "All Files | *"
);
#endif // DIALOG_H_HEADER_GUARD

View File

@ -0,0 +1,135 @@
/*
* Copyright 2019-2019 Attila Kocsis. All rights reserved.
* License: https://github.com/bkaradzic/bgfx#license-bsd-2-clause
*/
#include "entry_p.h"
#if BX_PLATFORM_OSX
#include <bx/allocator.h>
#include <bx/filepath.h>
#include <bx/string.h>
#include <bx/readerwriter.h>
#include <bx/process.h>
#include <bx/semaphore.h>
#import <AppKit/AppKit.h>
#include "dialog.h"
class Split
{
public:
Split(const bx::StringView& _str, char _ch)
: m_str(_str)
, m_token(_str.getPtr(), bx::strFind(_str, _ch).getPtr() )
, m_ch(_ch)
{
}
bx::StringView next()
{
bx::StringView result = m_token;
m_token = bx::strTrim(
bx::StringView(m_token.getTerm()+1
, bx::strFind(bx::StringView(m_token.getTerm()+1, m_str.getTerm() ), m_ch).getPtr() )
, " \t\n"
);
return result;
}
bool isDone() const
{
return m_token.isEmpty();
}
private:
const bx::StringView& m_str;
bx::StringView m_token;
char m_ch;
};
bool openFileSelectionDialog(
bx::FilePath& _inOutFilePath
, FileSelectionDialogType::Enum _type
, const bx::StringView& _title
, const bx::StringView& _filter
)
{
NSMutableArray* fileTypes = [NSMutableArray arrayWithCapacity:10];
bx::Error err;
for (bx::LineReader lr(_filter); !lr.isDone() && err.isOk();)
{
const bx::StringView line = lr.next();
const bx::StringView sep = bx::strFind(line, '|');
if (!sep.isEmpty() )
{
for (Split split(bx::strTrim(bx::StringView(sep.getPtr()+1, line.getTerm() ), " "), ' '); !split.isDone() && err.isOk();)
{
const bx::StringView token = split.next();
if ( token.getLength() >= 3 && token.getPtr()[0] == '*'
&& token.getPtr()[1] == '.' && bx::isAlphaNum(token.getPtr()[2]) )
{
NSString* extension = [[NSString alloc] initWithBytes:token.getPtr()+2 length:token.getLength()-2 encoding:NSASCIIStringEncoding];
[fileTypes addObject: extension];
}
}
}
}
__block NSString* fileName = nil;
bx::Semaphore semaphore;
bx::Semaphore* psemaphore = &semaphore;
CFRunLoopPerformBlock([[NSRunLoop mainRunLoop] getCFRunLoop],
kCFRunLoopCommonModes,
^{
NSSavePanel* panel = nil;
if ( FileSelectionDialogType::Open == _type)
{
NSOpenPanel* openPanel = [NSOpenPanel openPanel];
openPanel.canChooseFiles = TRUE;
openPanel.allowsMultipleSelection = FALSE;
openPanel.canChooseDirectories = FALSE;
panel = openPanel;
}
else
{
panel = [NSSavePanel savePanel];
}
panel.message = [[NSString alloc] initWithBytes:_title.getPtr() length:_title.getLength() encoding:NSASCIIStringEncoding];
panel.directoryURL = [NSURL URLWithString:@(_inOutFilePath.getCPtr())];
panel.allowedFileTypes = fileTypes;
if ([panel runModal] == NSModalResponseOK)
{
NSURL* url = [panel URL];
if (nil != url)
{
fileName = [url path];
[fileName retain];
}
}
[panel close];
psemaphore->post();
});
semaphore.wait();
if ( fileName != nil )
{
_inOutFilePath.set([fileName UTF8String]);
[fileName release];
return true;
}
return false;
}
#endif

View File

@ -20,6 +20,7 @@
#include <entry/entry.h>
#include <entry/input.h>
#include <entry/cmd.h>
#include <entry/dialog.h>
#include <imgui/imgui.h>
#include <bgfx_utils.h>
@ -239,209 +240,13 @@ static const char* s_filter = ""
"Truevision TGA (tga) | *.tga\n"
;
struct FileSelectionDialogType
{
enum Enum
{
Open,
Save,
Count
};
};
#if BX_PLATFORM_WINDOWS
extern "C" void* __stdcall GetModuleHandleA(const char* _moduleName);
extern "C" uint32_t __stdcall GetModuleFileNameA(void* _module, char* _outFilePath, uint32_t _size);
typedef uintptr_t (__stdcall *LPOFNHOOKPROC)(void*, uint32_t, uintptr_t, uint64_t);
struct OPENFILENAMEA
{
uint32_t structSize;
void* hwndOwner;
void* hinstance;
const char* filter;
const char* customFilter;
uint32_t maxCustomFilter;
uint32_t filterIndex;
const char* file;
uint32_t maxFile;
const char* fileTitle;
uint32_t maxFileTitle;
const char* initialDir;
const char* title;
uint32_t flags;
uint16_t fileOffset;
uint16_t fileExtension;
const char* defExt;
uint64_t customData;
LPOFNHOOKPROC hook;
const char* templateName;
void* reserved0;
uint32_t reserved1;
uint32_t flagsEx;
};
extern "C" bool __stdcall GetOpenFileNameA(OPENFILENAMEA* _ofn);
#endif // BX_PLATFORM_WINDOWS
class Split
{
public:
Split(const bx::StringView& _str, char _ch)
: m_str(_str)
, m_token(_str.getPtr(), bx::strFind(_str, _ch).getPtr() )
, m_ch(_ch)
{
}
bx::StringView next()
{
bx::StringView result = m_token;
m_token = bx::strTrim(
bx::StringView(m_token.getTerm()+1
, bx::strFind(bx::StringView(m_token.getTerm()+1, m_str.getTerm() ), m_ch).getPtr() )
, " \t\n"
);
return result;
}
bool isDone() const
{
return m_token.isEmpty();
}
private:
const bx::StringView& m_str;
bx::StringView m_token;
char m_ch;
};
bool openFileSelectionDialog(
bx::FilePath& _inOutFilePath
, FileSelectionDialogType::Enum _type
, const bx::StringView& _title
, const bx::StringView& _filter = "All Files | *"
)
{
#if BX_PLATFORM_LINUX || BX_PLATFORM_OSX
char tmp[4096];
bx::StaticMemoryBlockWriter writer(tmp, sizeof(tmp) );
bx::Error err;
bx::write(&writer, &err
, "--file-selection%s --title \"%.*s\" --filename \"%s\""
, FileSelectionDialogType::Save == _type ? " --save" : ""
, _title.getLength(), _title.getPtr()
, _inOutFilePath.getCPtr()
);
for (bx::LineReader lr(_filter); !lr.isDone();)
{
const bx::StringView line = lr.next();
bx::write(&writer, &err
, " --file-filter \"%.*s\""
, line.getLength(), line.getPtr()
);
}
if (err.isOk() )
{
bx::ProcessReader pr;
if (bx::open(&pr, "zenity", tmp, &err) )
{
char buffer[1024];
int32_t total = bx::read(&pr, buffer, sizeof(buffer), &err);
bx::close(&pr);
if (0 == pr.getExitCode() )
{
_inOutFilePath.set(bx::strRTrim(bx::StringView(buffer, total), "\n\r") );
return true;
}
}
}
#elif BX_PLATFORM_WINDOWS
BX_UNUSED(_type);
char out[bx::kMaxFilePath] = { '\0' };
OPENFILENAMEA ofn;
bx::memSet(&ofn, 0, sizeof(ofn) );
ofn.structSize = sizeof(OPENFILENAMEA);
ofn.initialDir = _inOutFilePath.getCPtr();
ofn.file = out;
ofn.maxFile = sizeof(out);
ofn.flags = 0
| /* OFN_EXPLORER */ 0x00080000
| /* OFN_FILEMUSTEXIST */ 0x00001000
| /* OFN_DONTADDTORECENT */ 0x02000000
;
char tmp[4096];
bx::StaticMemoryBlockWriter writer(tmp, sizeof(tmp) );
bx::Error err;
ofn.title = tmp;
bx::write(&writer, &err, "%.*s", _title.getLength(), _title.getPtr() );
bx::write(&writer, '\0', &err);
ofn.filter = tmp + uint32_t(bx::seek(&writer) );
for (bx::LineReader lr(_filter); !lr.isDone() && err.isOk();)
{
const bx::StringView line = lr.next();
const bx::StringView sep = bx::strFind(line, '|');
if (!sep.isEmpty() )
{
bx::write(&writer, bx::strTrim(bx::StringView(line.getPtr(), sep.getPtr() ), " "), &err);
bx::write(&writer, '\0', &err);
bool first = true;
for (Split split(bx::strTrim(bx::StringView(sep.getPtr()+1, line.getTerm() ), " "), ' '); !split.isDone() && err.isOk();)
{
const bx::StringView token = split.next();
if (!first)
{
bx::write(&writer, ';', &err);
}
first = false;
bx::write(&writer, token, &err);
}
bx::write(&writer, '\0', &err);
}
else
{
bx::write(&writer, line, &err);
bx::write(&writer, '\0', &err);
bx::write(&writer, '\0', &err);
}
}
bx::write(&writer, '\0', &err);
if (err.isOk()
&& GetOpenFileNameA(&ofn) )
{
_inOutFilePath.set(ofn.file);
return true;
}
#else
BX_UNUSED(_inOutFilePath, _type, _title, _filter);
#endif // BX_PLATFORM_LINUX || BX_PLATFORM_OSX
return false;
}
struct View
{
View()