22#define BLIT_IT_NATIVES_DLL_COMPILE
33
44#include " natives.h"
5+
56#include " threadutils.h"
67
8+ #include < list>
9+ #include < string>
10+
711#include < Windows.h>
812
913using namespace std ;
1014
11- ChooseFileSuccessCallback _chooseFileSuccessCallback = NULL ;
12- ChooseFileCancelledCallback _chooseFileCancelledCallback = NULL ;
15+ struct ChooseFileContext
16+ {
17+ ChooseFileSuccessCallback _chooseFileSuccessCallback;
18+ ChooseFileCancelledCallback _chooseFileCancelledCallback;
19+ pthread_t file_picker_thread;
20+ list<wstring> filetype_names;
21+ list<wstring> filetype_extensions;
22+ };
1323
14- pthread_mutex_t file_picker_mutex = PTHREAD_MUTEX_INITIALIZER;
15- pthread_t file_picker_thread;
16- bool file_picker_running = false ;
1724
18- void * LoadGcodeAsync (void * arg)
25+ void * FilePickerThread (void * arg)
1926{
27+ ChooseFileContext* cfc = (ChooseFileContext*)arg;
28+
2029 const int buf_len = 260 ;
21- TCHAR cwd[buf_len] = { 0 };
30+ // TCHAR cwd[buf_len] = { 0 };
2231
23- GetCurrentDirectory (buf_len, cwd);
32+ // GetCurrentDirectory(buf_len, cwd);
2433
2534 OPENFILENAME ofn; // common dialog box structure
2635 TCHAR szFile[buf_len]; // buffer for file name
2736 // HWND hwnd; // owner window
2837 // HANDLE hf; // file handle
29- TCHAR filter[64 ] = TEXT (" G-code\0 *.gcode\0 All\0 *.*\0 "
38+
39+
40+
41+ // string test("G-code\0*.gcode\0All\0*.*\0");
42+ wstring filetype_filters;
43+ list<wstring>::const_iterator ext_itr = cfc->filetype_extensions .begin ();
44+ for (list<wstring>::const_iterator name_itr = cfc->filetype_names .begin (); name_itr != cfc->filetype_names .end (); ++name_itr)
45+ {
46+ filetype_filters += *name_itr;
47+ filetype_filters.push_back (' \0 '
48+ filetype_filters += L" *."
49+ filetype_filters += *ext_itr;
50+ filetype_filters.push_back (' \0 '
51+ ++ext_itr;
52+ }
53+ filetype_filters += L" All"
54+ filetype_filters.push_back (' \0 '
55+ filetype_filters += L" *.*"
56+ filetype_filters.push_back (' \0 '
57+
58+
59+ // TCHAR filter[64] = TEXT(((const char*)test.c_str()));
60+
61+ TCHAR* filter = (TCHAR*)filetype_filters.c_str ();
62+
63+
64+
3065
3166 // Initialize OPENFILENAME
3267 ZeroMemory (&ofn, sizeof (ofn));
@@ -44,46 +79,55 @@ void* LoadGcodeAsync(void* arg)
4479 ofn.lpstrInitialDir = NULL ;
4580 ofn.Flags = OFN_PATHMUSTEXIST | OFN_FILEMUSTEXIST | OFN_NOCHANGEDIR | OFN_READONLY;
4681
47- SetCurrentDirectory (cwd);
82+ // SetCurrentDirectory(cwd);
4883
4984 if (GetOpenFileName (&ofn))
5085 {
51- if (_chooseFileSuccessCallback)
52- _chooseFileSuccessCallback ();
86+ pthread_testcancel ();
87+ if (cfc->_chooseFileSuccessCallback )
88+ cfc->_chooseFileSuccessCallback (ofn.lpstrFile );
5389 }
5490 else
5591 {
56- if (_chooseFileCancelledCallback)
57- _chooseFileCancelledCallback ();
92+ pthread_testcancel ();
93+ if (cfc->_chooseFileCancelledCallback )
94+ cfc->_chooseFileCancelledCallback ();
5895 }
5996
6097 return NULL ;
6198}
6299
63100
64- void __stdcall RegisterChooseFileSuccessCallback (ChooseFileSuccessCallback callback )
101+ void * __stdcall CreateChooseFileContext ( )
65102{
66- _chooseFileSuccessCallback = callback;
103+ ChooseFileContext* cfc = new ChooseFileContext ();
104+ cfc->_chooseFileCancelledCallback = NULL ;
105+ cfc->_chooseFileSuccessCallback = NULL ;
106+ return cfc;
67107}
68108
69109
70- void __stdcall RegisterChooseFileCancelledCallback (ChooseFileCancelledCallback callback )
110+ void __stdcall AddChooseFileType ( void * context, const wchar_t * name, const wchar_t * extension )
71111{
72- _chooseFileCancelledCallback = callback;
112+ ChooseFileContext* cfc = (ChooseFileContext*)context;
113+ cfc->filetype_names .push_back (wstring (name));
114+ cfc->filetype_extensions .push_back (wstring (extension));
73115}
74116
75117
76- void __stdcall ChooseFile ()
118+ void __stdcall ChooseFile (void * context, ChooseFileSuccessCallback successCallback, ChooseFileCancelledCallback cancelledCallback )
77119{
78- pthread_mutex_lock (&shared_machine_mutex);
79- if (shared_machine == NULL )
80- {
81- shared_machine = new Machine ();
82- loading_thread_started = true ;
83- pthread_create (&loading_thread, NULL , LoadGcodeAsync, NULL );
84- }
85- pthread_mutex_unlock (&shared_machine_mutex);
120+ ChooseFileContext* cfc = (ChooseFileContext*)context;
121+ cfc->_chooseFileSuccessCallback = successCallback;
122+ cfc->_chooseFileCancelledCallback = cancelledCallback;
123+ pthread_create (&cfc->file_picker_thread , NULL , FilePickerThread, cfc);
86124}
87125
88126
127+ void __stdcall DestroyChooseFileContext (void * context)
128+ {
129+ ChooseFileContext* cfc = (ChooseFileContext*)context;
130+ pthread_cancel (cfc->file_picker_thread );
131+ delete cfc;
132+ }
89133
0 commit comments