claunia/VARCem
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Some minor changes, mostly for some leftover EuroPC things.

Browse Source 
Version bumped to 0.1.6.0 - finalizing for release.
This commit is contained in:
waltje
2018-05-12 23:53:10 -04:00
parent d393e95f8f
commit cfda8ef931
5 changed files with 88 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
src/win/win_dialog.c
View File

@@ -8,7 +8,7 @@
*
* Implementation of server several dialogs.
*
* Version: @(#)win_dialog.c 1.0.9 2018/05/09
* Version: @(#)win_dialog.c 1.0.10 2018/05/11
*
* Authors: Fred N. van Kempen, <decwiz@yahoo.com>
* Miran Grca, <mgrca8@gmail.com>
@@ -120,7 +120,7 @@ ui_msgbox(int flags, void *arg)
case MBX_CONFIG: /* configuration */
fl = (MB_YESNO | MB_ICONERROR);
cap = get_string(IDS_2050); /* "Configuration Error" */
cap = get_string(IDS_2050); /* "Configuration Error" */
break;
}
@@ -193,22 +193,49 @@ dlg_file_hook(HWND hdlg, UINT uiMsg, WPARAM wParam, LPARAM lParam)
int
dlg_file_ex(HWND h, const wchar_t *f, const wchar_t *ifn, wchar_t *fn, int fl)
{
wchar_t temp[512];
wchar_t temp[512], *str;
wchar_t path[512];
OPENFILENAME ofn;
DWORD err;
BOOL r;
int ret;
/* Clear the temp path. */
memset(temp, 0x00, sizeof(temp));
/* Initialize OPENFILENAME. */
memset(&ofn, 0x00, sizeof(OPENFILENAME));
ofn.lStructSize = sizeof(ofn);
ofn.hwndOwner = h;
ofn.lpfnHook = dlg_file_hook;
/* This is the buffer in which to place the resulting filename. */
/* Tell the dialog where to go initially. */
memset(temp, 0x00, sizeof(temp));
if ((ifn != NULL) && (*ifn != L'\0')) {
/* We seem to have a valid path, use that. */
if (! plat_path_abs(ifn))
wcscpy(temp, usr_path);
wcscat(temp, ifn);
/* Re-slash the path, OpenFileName does not like forward slashes. */
str = temp;
while (*str != L'\0') {
if (*str == L'/')
*str = L'\\';
str++;
}
ofn.lpstrInitialDir = NULL;
} else {
/* Re-slash the path, OpenFileName does not like forward slashes. */
wcscpy(path, usr_path);
str = path;
while (*str != L'\0') {
if (*str == L'/')
*str = L'\\';
str++;
}
/* No initial path, use the usr_path value. */
ofn.lpstrInitialDir = path;
}
ofn.lpstrFile = temp;
ofn.nMaxFile = sizeof_w(temp);
@@ -218,15 +245,10 @@ dlg_file_ex(HWND h, const wchar_t *f, const wchar_t *ifn, wchar_t *fn, int fl)
ofn.lpstrFileTitle = NULL;
ofn.nMaxFileTitle = 0;
/* Tell the dialog where to go initially. */
if (ifn == NULL)
ifn = usr_path;
ofn.lpstrInitialDir = ifn;
wcscpy(fn, ifn);
/* Set up the flags for this dialog. */
r = (fl & DLG_FILE_RO) ? TRUE : FALSE;
ofn.Flags = OFN_ENABLEHOOK | OFN_EXPLORER | OFN_PATHMUSTEXIST;
ofn.Flags = OFN_ENABLESIZING | OFN_ENABLEHOOK | OFN_EXPLORER | \
OFN_PATHMUSTEXIST | OFN_OVERWRITEPROMPT | OFN_DONTADDTORECENT;
if (! (fl & DLG_FILE_SAVE)) {
ofn.Flags |= OFN_FILEMUSTEXIST;
@@ -240,7 +262,7 @@ dlg_file_ex(HWND h, const wchar_t *f, const wchar_t *ifn, wchar_t *fn, int fl)
else
r = GetOpenFileName(&ofn);
/* OK, just to make sure the dialog did not change our CWD. */
/* As OFN_NOCHANGEDIR does not work (see MSDN), just make sure. */
plat_chdir(usr_path);
if (r) {
@@ -257,8 +279,8 @@ dlg_file_ex(HWND h, const wchar_t *f, const wchar_t *ifn, wchar_t *fn, int fl)
/* If an error occurred, log this. */
if ((err = CommDlgExtendedError()) != NO_ERROR) {
sprintf((char *)temp,
"%sFile(%ls, %02x):\n\n error 0x%08lx",
(fl & DLG_FILE_SAVE)?"Save":"Open", ifn, fl, err);
"%sFile('%ls', %02x):\n\n error 0x%08lx",
(fl & DLG_FILE_SAVE)?"Save":"Open", temp, fl, err);
pclog("%s\n", (char *)temp);
(void)ui_msgbox(MBX_ERROR|MBX_ANSI, (char *)temp);
}

12
src/win/win_ui.c
View File

@@ -8,7 +8,7 @@
*
* Implement the user Interface module.
*
* Version: @(#)win_ui.c 1.0.23 2018/05/10
* Version: @(#)win_ui.c 1.0.24 2018/05/12
*
* Authors: Fred N. van Kempen, <decwiz@yahoo.com>
* Miran Grca, <mgrca8@gmail.com>
@@ -742,12 +742,16 @@ input_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
{
switch (message) {
case WM_INPUT:
#if defined(WALTJE) && defined(_DEBUG) && defined(USE_SDL)
pclog("UI: hwnd=%08lx WM_INPUT (infocus=%d) !\n", hwnd, infocus);
#endif
keyboard_handle(lParam, infocus);
break;
case WM_SETFOCUS:
#if defined(WALTJE) && defined(_DEBUG) && defined(USE_SDL)
pclog("UI: hwnd=%08lx WM_SETFOCUS (infocus=%d) !\n", hwnd, infocus);
#endif
infocus = 1;
if (! hook_enabled) {
hKeyboardHook = SetWindowsHookEx(WH_KEYBOARD_LL,
@@ -759,7 +763,9 @@ pclog("UI: hwnd=%08lx WM_SETFOCUS (infocus=%d) !\n", hwnd, infocus);
break;
case WM_KILLFOCUS:
#if defined(WALTJE) && defined(_DEBUG) && defined(USE_SDL)
pclog("UI: hwnd=%08lx WM_KILLFOCUS (infocus=%d) !\n", hwnd, infocus);
#endif
infocus = 0;
plat_mouse_capture(0);
if (hook_enabled) {
@@ -769,13 +775,17 @@ pclog("UI: hwnd=%08lx WM_KILLFOCUS (infocus=%d) !\n", hwnd, infocus);
break;
case WM_LBUTTONUP:
#if defined(WALTJE) && defined(_DEBUG) && defined(USE_SDL)
pclog("UI: hwnd=%08lx WM_LBUTTONUP (infocus=%d) !\n", hwnd, infocus);
#endif
if (! vid_fullscreen)
plat_mouse_capture(1);
break;
case WM_MBUTTONUP:
#if defined(WALTJE) && defined(_DEBUG) && defined(USE_SDL)
pclog("UI: hwnd=%08lx WM_MBUTTONUP (infocus=%d) !\n", hwnd, infocus);
#endif
if (mouse_get_buttons() < 3)
plat_mouse_capture(0);
break;