interesting
/
andlabs-ui
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Implemented new dialog box techniques on Windows... kinda.

This commit is contained in:
Pietro Gagliardi 2014-08-19 03:31:53 -04:00
parent 32c1d47fd8
commit b6a5735f89
2 changed files with 37 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
redo/dialog_windows.c
View File

@ -6,6 +6,17 @@
// this should be reasonable // this should be reasonable
#define NFILENAME 4096 #define NFILENAME 4096
static UINT_PTR CALLBACK openSaveFileHook(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
{
// the hook procedure is documented as being the dialog procedure for a special child dialog box, not the main one
// as such, the WM_DESTROY here is for that child dialog box, not for the main one
// I /think/ this would be perfect for re-enabling other windows in the right order (see http://blogs.msdn.com/b/oldnewthing/archive/2004/02/27/81155.aspx)
// TODO THIS DOES NOT WORK
if (uMsg == WM_DESTROY)
SendMessageW(msgwin, msgEndModal, 0, 0);
return 0;
}
WCHAR *openFile(void) WCHAR *openFile(void)
{ {
OPENFILENAMEW ofn; OPENFILENAMEW ofn;
@ -28,7 +39,9 @@ WCHAR *openFile(void)
ofn.lpstrTitle = NULL; // let system decide ofn.lpstrTitle = NULL; // let system decide
// TODO OFN_SHAREAWARE? // TODO OFN_SHAREAWARE?
// TODO remove OFN_NODEREFERENCELINKS? or does no filters ensure that anyway? // TODO remove OFN_NODEREFERENCELINKS? or does no filters ensure that anyway?
ofn.Flags = OFN_EXPLORER | OFN_FILEMUSTEXIST | OFN_FORCESHOWHIDDEN | OFN_HIDEREADONLY | OFN_LONGNAMES | OFN_NOCHANGEDIR | OFN_NODEREFERENCELINKS | OFN_NOTESTFILECREATE | OFN_PATHMUSTEXIST; ofn.Flags = OFN_ENABLEHOOK | OFN_EXPLORER | OFN_FILEMUSTEXIST | OFN_FORCESHOWHIDDEN | OFN_HIDEREADONLY | OFN_LONGNAMES | OFN_NOCHANGEDIR | OFN_NODEREFERENCELINKS | OFN_NOTESTFILECREATE | OFN_PATHMUSTEXIST;
ofn.lpfnHook = openSaveFileHook;
SendMessageW(msgwin, msgBeginModal, 0, 0);
if (GetOpenFileNameW(&ofn) == FALSE) { if (GetOpenFileNameW(&ofn) == FALSE) {
// TODO stringify // TODO stringify
err = CommDlgExtendedError(); err = CommDlgExtendedError();

23
redo/uitask_windows.c
View File

@ -71,6 +71,13 @@ HWND msgwin;
#define msgwinclass L"gouimsgwin" #define msgwinclass L"gouimsgwin"
static BOOL CALLBACK beginEndModalAll(HWND hwnd, LPARAM lParam)
{
if (hwnd != msgwin)
SendMessageW(hwnd, (UINT) lParam, 0, 0);
return TRUE;
}
static LRESULT CALLBACK msgwinproc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) static LRESULT CALLBACK msgwinproc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
{ {
LRESULT shared; LRESULT shared;
@ -84,8 +91,24 @@ static LRESULT CALLBACK msgwinproc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM l
return 0; return 0;
// TODO respond to WM_THEMECHANGED // TODO respond to WM_THEMECHANGED
case msgRequest: case msgRequest:
// in modal?
if (GetWindowLongPtrW(hwnd, GWLP_USERDATA) != 0) {
// post again later
// TODO this chokes the message queue!
issue((void *) lParam);
return 0;
}
// nope, we can run now
doissue((void *) lParam); doissue((void *) lParam);
return 0; return 0;
case msgBeginModal:
SetWindowLongPtrW(hwnd, GWLP_USERDATA, 1);
EnumThreadWindows(GetCurrentThreadId(), beginEndModalAll, msgBeginModal);
return 0;
case msgEndModal:
SetWindowLongPtrW(hwnd, GWLP_USERDATA, 0);
EnumThreadWindows(GetCurrentThreadId(), beginEndModalAll, msgEndModal);
return 0;
default: default:
return DefWindowProcW(hwnd, uMsg, wParam, lParam); return DefWindowProcW(hwnd, uMsg, wParam, lParam);
} }