80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Introduce ui_msgbox_ex, allowing for customizable header and buttons

Browse Source
This commit is contained in:
RichardG867
2020-06-18 20:34:12 -03:00
parent 5957832a41
commit 47544cd02b
2 changed files with 68 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/include/86box/ui.h
View File

@@ -36,8 +36,10 @@ extern "C" {
#define MBX_QUESTION_YN 4 #define MBX_QUESTION_YN 4
#define MBX_FATAL 0x20 #define MBX_FATAL 0x20
#define MBX_ANSI 0x80 #define MBX_ANSI 0x80
#define MBX_LINKS 0x100
extern int ui_msgbox(int type, void *arg); extern int ui_msgbox(int flags, void *message);
extern int ui_msgbox_ex(int flags, void *header, void *message, void *btn1, void *btn2, void *btn3);
extern void ui_check_menu_item(int id, int checked); extern void ui_check_menu_item(int id, int checked);

124
src/win/win_dialog.c
View File

@@ -34,97 +34,103 @@
#include <86box/win.h> #include <86box/win.h>
#define STRING_OR_RESOURCE(s) ((!(s)) ? (NULL) : ((((uintptr_t)s) < ((uintptr_t)65636)) ? (MAKEINTRESOURCE(s)) : (s)))
WCHAR wopenfilestring[512]; WCHAR wopenfilestring[512];
char openfilestring[512]; char openfilestring[512];
uint8_t filterindex = 0; uint8_t filterindex = 0;
int int
ui_msgbox(int flags, void *arg) ui_msgbox(int flags, void *message)
{ {
WCHAR temp[512]; return ui_msgbox_ex(flags, NULL, message, NULL, NULL, NULL);
int fl = 0; }
PCWSTR icon = NULL;
WCHAR *str = NULL;
WCHAR *cap = NULL;
int
ui_msgbox_ex(int flags, void *header, void *message, void *btn1, void *btn2, void *btn3) {
WCHAR temp[512];
TASKDIALOGCONFIG tdconfig = {0};
TASKDIALOG_BUTTON tdbuttons[3],
tdb_yes = {IDYES, STRING_OR_RESOURCE(btn1)},
tdb_no = {IDNO, STRING_OR_RESOURCE(btn2)},
tdb_cancel = {IDCANCEL, STRING_OR_RESOURCE(btn3)};
int ret = 0;
/* Configure the default OK button. */
tdconfig.cButtons = 0;
if (btn1)
tdbuttons[tdconfig.cButtons++] = tdb_yes;
else
tdconfig.dwCommonButtons = TDCBF_OK_BUTTON;
/* Configure the message type. */
switch(flags & 0x1f) { switch(flags & 0x1f) {
case MBX_INFO: /* just an informational message */ case MBX_INFO: /* just an informational message */
icon = TD_INFORMATION_ICON; tdconfig.pszMainIcon = TD_INFORMATION_ICON;
fl = TDCBF_OK_BUTTON;
break; break;
case MBX_ERROR: /* error message */ case MBX_ERROR: /* error message */
fl = TDCBF_OK_BUTTON;
if (flags & MBX_FATAL) { if (flags & MBX_FATAL) {
icon = TD_ERROR_ICON; tdconfig.pszMainIcon = TD_ERROR_ICON;
cap = plat_get_string(IDS_2050); /* "Fatal error" */ tdconfig.pszMainInstruction = MAKEINTRESOURCE(IDS_2050); /* "Fatal error" */
} else { } else {
icon = TD_WARNING_ICON; tdconfig.pszMainIcon = TD_WARNING_ICON;
cap = plat_get_string(IDS_2049); /* "Error" */ tdconfig.pszMainInstruction = MAKEINTRESOURCE(IDS_2049); /* "Error" */
} }
break; break;
case MBX_QUESTION: /* question */ case MBX_QUESTION: /* question */
fl = TDCBF_YES_BUTTON | TDCBF_NO_BUTTON | TDCBF_CANCEL_BUTTON; case MBX_QUESTION_YN:
break; if (!btn1) /* replace default "OK" button with "Yes" button */
tdconfig.dwCommonButtons = TDCBF_YES_BUTTON;
case MBX_QUESTION_YN: /* question */ if (btn2) /* "No" button */
fl = TDCBF_YES_BUTTON | TDCBF_NO_BUTTON; tdbuttons[tdconfig.cButtons++] = tdb_no;
else
tdconfig.dwCommonButtons |= TDCBF_NO_BUTTON;
if (flags & MBX_QUESTION) {
if (btn3) /* "Cancel" button */
tdbuttons[tdconfig.cButtons++] = tdb_cancel;
else
tdconfig.dwCommonButtons |= TDCBF_CANCEL_BUTTON;
}
break; break;
} }
/* If ANSI string, convert it. */ /* If the message is an ANSI string, convert it. */
str = (WCHAR *)arg; tdconfig.pszContent = (WCHAR *) STRING_OR_RESOURCE(message);
if (flags & MBX_ANSI) { if (flags & MBX_ANSI) {
mbstowcs(temp, (char *)arg, strlen((char *)arg)+1); mbstowcs(temp, (char *)message, strlen((char *)message)+1);
str = temp; tdconfig.pszContent = temp;
} else {
/*
* It's a Unicode string.
*
* Well, no, maybe not. It could also be one of the
* strings stored in the Resources. Those are wide,
* but referenced by a numeric ID.
*
* The good news is, that strings are usually stored
* in the executable near the end of the code/rodata
* segment. This means, that *real* string pointers
* usually have a pretty high (numeric) value, much
* higher than the numeric ID's. So, we guesswork
* that if the value of 'arg' is low, its an ID..
*/
if (((uintptr_t)arg) < ((uintptr_t)65636))
str = MAKEINTRESOURCE((intptr_t)arg);
} }
/* At any rate, we do have a valid (wide) string now. */ /* Configure the rest of the TaskDialog. */
TaskDialog(hwndMain, tdconfig.cbSize = sizeof(tdconfig);
NULL, tdconfig.hwndParent = hwndMain;
MAKEINTRESOURCE(IDS_STRINGS), if (flags & MBX_LINKS)
cap, tdconfig.dwFlags = TDF_USE_COMMAND_LINKS;
str, tdconfig.pszWindowTitle = MAKEINTRESOURCE(IDS_STRINGS);
fl, if (header)
icon, tdconfig.pszMainInstruction = STRING_OR_RESOURCE(header);
&fl); tdconfig.pButtons = tdbuttons;
/* Run the TaskDialog. */
TaskDialogIndirect(&tdconfig, &ret, NULL, NULL);
/* Convert return values to generic ones. */ /* Convert return values to generic ones. */
if (fl == IDNO) fl = 1; if (ret == IDNO) ret = 1;
else if (fl == IDCANCEL) fl = -1; else if (ret == IDCANCEL) ret = -1;
else fl = 0; else ret = 0;
return(fl); return(ret);
} }
#if 0
int
msgbox_reset_yn(HWND hwnd)
{
return(MessageBox(hwnd, plat_get_string(IDS_2051),
#endif
int int
file_dlg_w(HWND hwnd, WCHAR *f, WCHAR *fn, int save) file_dlg_w(HWND hwnd, WCHAR *f, WCHAR *fn, int save)
{ {