ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Combine ui/drivers/win32 files into one (ui/drivers/ui_win32.c)

This commit is contained in:
twinaphex 2021-03-08 00:20:06 +01:00
parent 1207001bba
commit 2675afe45d
8 changed files with 252 additions and 379 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile.common
View File

@ -1393,11 +1393,7 @@ endif
# Companion UI # Companion UI
ifneq ($(findstring Win32,$(OS)),) ifneq ($(findstring Win32,$(OS)),)
OBJ += ui/drivers/ui_win32.o \ OBJ += ui/drivers/ui_win32.o
ui/drivers/win32/ui_win32_window.o \
ui/drivers/win32/ui_win32_browser_window.o \
ui/drivers/win32/ui_win32_msg_window.o \
ui/drivers/win32/ui_win32_application.o
endif endif
# Video # Video

4
griffin/griffin.c
View File

@ -1181,10 +1181,6 @@ UI
============================================================ */ ============================================================ */
#if defined(_WIN32) && !defined(_XBOX) && !defined(__WINRT__) #if defined(_WIN32) && !defined(_XBOX) && !defined(__WINRT__)
#include "../ui/drivers/ui_win32.c" #include "../ui/drivers/ui_win32.c"
#include "../ui/drivers/win32/ui_win32_window.c"
#include "../ui/drivers/win32/ui_win32_browser_window.c"
#include "../ui/drivers/win32/ui_win32_msg_window.c"
#include "../ui/drivers/win32/ui_win32_application.c"
#endif #endif
/*============================================================ /*============================================================

251
ui/drivers/ui_win32.c
View File

@ -31,6 +31,10 @@
#define _WIN32_WINNT 0x0500 //_WIN32_WINNT_WIN2K #define _WIN32_WINNT 0x0500 //_WIN32_WINNT_WIN2K
#endif #endif
#ifndef _WIN32_IE
#define _WIN32_IE 0x0300
#endif
#include "../../gfx/common/win32_common.h" #include "../../gfx/common/win32_common.h"
#include <windows.h> #include <windows.h>
#include <commdlg.h> #include <commdlg.h>
@ -47,12 +51,259 @@
#include "../../msg_hash.h" #include "../../msg_hash.h"
#include "../../driver.h" #include "../../driver.h"
#include "../../paths.h" #include "../../paths.h"
#include "../../configuration.h"
#include "../../retroarch.h" #include "../../retroarch.h"
#include "../../tasks/tasks_internal.h" #include "../../tasks/tasks_internal.h"
#include "../../frontend/drivers/platform_win32.h" #include "../../frontend/drivers/platform_win32.h"
#include "ui_win32.h" #include "ui_win32.h"
extern ui_window_win32_t main_window;
extern HACCEL window_accelerators;
static void* ui_application_win32_initialize(void)
{
return NULL;
}
static void ui_application_win32_process_events(void)
{
MSG msg;
while (PeekMessage(&msg, 0, 0, 0, PM_REMOVE))
{
bool translated_accelerator = main_window.hwnd == msg.hwnd && TranslateAccelerator(msg.hwnd, window_accelerators, &msg) != 0;
if (!translated_accelerator)
{
TranslateMessage(&msg);
DispatchMessage(&msg);
}
}
}
static ui_application_t ui_application_win32 = {
ui_application_win32_initialize,
ui_application_win32_process_events,
NULL,
false,
"win32"
};
static void* ui_window_win32_init(void)
{
return NULL;
}
static void ui_window_win32_destroy(void *data)
{
ui_window_win32_t *window = (ui_window_win32_t*)data;
DestroyWindow(window->hwnd);
}
static void ui_window_win32_set_focused(void *data)
{
ui_window_win32_t *window = (ui_window_win32_t*)data;
SetFocus(window->hwnd);
}
static void ui_window_win32_set_visible(void *data,
bool set_visible)
{
ui_window_win32_t *window = (ui_window_win32_t*)data;
ShowWindow(window->hwnd, set_visible ? SW_SHOWNORMAL : SW_HIDE);
}
static void ui_window_win32_set_title(void *data, char *buf)
{
ui_window_win32_t *window = (ui_window_win32_t*)data;
SetWindowText(window->hwnd, buf);
}
void ui_window_win32_set_droppable(void *data, bool droppable)
{
/* Minimum supported client: Windows XP,
* minimum supported server: Windows 2000 Server */
ui_window_win32_t *window = (ui_window_win32_t*)data;
if (DragAcceptFiles_func)
DragAcceptFiles_func(window->hwnd, droppable);
}
static bool ui_window_win32_focused(void *data)
{
ui_window_win32_t *window = (ui_window_win32_t*)data;
return (GetForegroundWindow() == window->hwnd);
}
static ui_window_t ui_window_win32 = {
ui_window_win32_init,
ui_window_win32_destroy,
ui_window_win32_set_focused,
ui_window_win32_set_visible,
ui_window_win32_set_title,
ui_window_win32_set_droppable,
ui_window_win32_focused,
"win32"
};
static enum ui_msg_window_response ui_msg_window_win32_response(
ui_msg_window_state *state, UINT response)
{
switch (response)
{
case IDOK:
return UI_MSG_RESPONSE_OK;
case IDCANCEL:
return UI_MSG_RESPONSE_CANCEL;
case IDYES:
return UI_MSG_RESPONSE_YES;
case IDNO:
return UI_MSG_RESPONSE_NO;
default:
break;
}
switch (state->buttons)
{
case UI_MSG_WINDOW_OK:
return UI_MSG_RESPONSE_OK;
case UI_MSG_WINDOW_OKCANCEL:
return UI_MSG_RESPONSE_CANCEL;
case UI_MSG_WINDOW_YESNO:
return UI_MSG_RESPONSE_NO;
case UI_MSG_WINDOW_YESNOCANCEL:
return UI_MSG_RESPONSE_CANCEL;
default:
break;
}
return UI_MSG_RESPONSE_NA;
}
static UINT ui_msg_window_win32_buttons(ui_msg_window_state *state)
{
switch (state->buttons)
{
case UI_MSG_WINDOW_OK:
return MB_OK;
case UI_MSG_WINDOW_OKCANCEL:
return MB_OKCANCEL;
case UI_MSG_WINDOW_YESNO:
return MB_YESNO;
case UI_MSG_WINDOW_YESNOCANCEL:
return MB_YESNOCANCEL;
}
return 0;
}
static enum ui_msg_window_response ui_msg_window_win32_error(
ui_msg_window_state *state)
{
UINT flags = MB_ICONERROR | ui_msg_window_win32_buttons(state);
return ui_msg_window_win32_response(state,
MessageBoxA(NULL, (LPCSTR)state->text, (LPCSTR)state->title, flags));
}
static enum ui_msg_window_response ui_msg_window_win32_information(
ui_msg_window_state *state)
{
UINT flags = MB_ICONINFORMATION | ui_msg_window_win32_buttons(state);
return ui_msg_window_win32_response(state,
MessageBoxA(NULL, (LPCSTR)state->text, (LPCSTR)state->title, flags));
}
static enum ui_msg_window_response ui_msg_window_win32_question(
ui_msg_window_state *state)
{
UINT flags = MB_ICONQUESTION | ui_msg_window_win32_buttons(state);
return ui_msg_window_win32_response(state,
MessageBoxA(NULL, (LPCSTR)state->text, (LPCSTR)state->title, flags));
}
static enum ui_msg_window_response ui_msg_window_win32_warning(
ui_msg_window_state *state)
{
UINT flags = MB_ICONWARNING | ui_msg_window_win32_buttons(state);
return ui_msg_window_win32_response(state,
MessageBoxA(NULL, (LPCSTR)state->text, (LPCSTR)state->title, flags));
}
static ui_msg_window_t ui_msg_window_win32 = {
ui_msg_window_win32_error,
ui_msg_window_win32_information,
ui_msg_window_win32_question,
ui_msg_window_win32_warning,
"win32"
};
static bool ui_browser_window_win32_core(
ui_browser_window_state_t *state, bool save)
{
OPENFILENAME ofn;
bool okay = true;
settings_t *settings = config_get_ptr();
bool video_fullscreen = settings->bools.video_fullscreen;
ofn.lStructSize = sizeof(OPENFILENAME);
ofn.hwndOwner = (HWND)state->window;
ofn.hInstance = NULL;
ofn.lpstrFilter = state->filters; /* actually const */
ofn.lpstrCustomFilter = NULL;
ofn.nMaxCustFilter = 0;
ofn.nFilterIndex = 0;
ofn.lpstrFile = state->path;
ofn.nMaxFile = PATH_MAX;
ofn.lpstrFileTitle = NULL;
ofn.nMaxFileTitle = 0;
ofn.lpstrInitialDir = state->startdir;
ofn.lpstrTitle = state->title;
ofn.Flags = OFN_FILEMUSTEXIST
| OFN_HIDEREADONLY
| OFN_NOCHANGEDIR;
ofn.nFileOffset = 0;
ofn.nFileExtension = 0;
ofn.lpstrDefExt = "";
ofn.lCustData = 0;
ofn.lpfnHook = NULL;
ofn.lpTemplateName = NULL;
#if (_WIN32_WINNT >= 0x0500)
ofn.pvReserved = NULL;
ofn.dwReserved = 0;
ofn.FlagsEx = 0;
#endif
/* Full Screen: Show mouse for the file dialog */
if (video_fullscreen)
video_driver_show_mouse();
if (!save && !GetOpenFileName(&ofn))
okay = false;
if (save && !GetSaveFileName(&ofn))
okay = false;
/* Full screen: Hide mouse after the file dialog */
if (video_fullscreen)
video_driver_hide_mouse();
return okay;
}
static bool ui_browser_window_win32_open(ui_browser_window_state_t *state)
{
return ui_browser_window_win32_core(state, false);
}
static bool ui_browser_window_win32_save(ui_browser_window_state_t *state)
{
return ui_browser_window_win32_core(state, true);
}
static ui_browser_window_t ui_browser_window_win32 = {
ui_browser_window_win32_open,
ui_browser_window_win32_save,
"win32"
};
static void ui_companion_win32_deinit(void *data) { } static void ui_companion_win32_deinit(void *data) { }
static void *ui_companion_win32_init(void) { return (void*)-1; } static void *ui_companion_win32_init(void) { return (void*)-1; }
static void ui_companion_win32_notify_content_loaded(void *data) { } static void ui_companion_win32_notify_content_loaded(void *data) { }

57
ui/drivers/win32/ui_win32_application.c
View File

@ -1,57 +0,0 @@
/* RetroArch - A frontend for libretro.
* Copyright (C) 2011-2017 - Daniel De Matteis
*
* RetroArch is free software: you can redistribute it and/or modify it under the terms
* of the GNU General Public License as published by the Free Software Found-
* ation, either version 3 of the License, or (at your option) any later version.
*
* RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
* without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
* PURPOSE. See the GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along with RetroArch.
* If not, see <http://www.gnu.org/licenses/>.
*/
#include <stdint.h>
#include <boolean.h>
#include <stddef.h>
#include <stdlib.h>
#include <string.h>
#include <windows.h>
#include "../../ui_companion_driver.h"
#include "../ui_win32.h"
extern ui_window_win32_t main_window;
extern HACCEL window_accelerators;
static void* ui_application_win32_initialize(void)
{
return NULL;
}
static void ui_application_win32_process_events(void)
{
MSG msg;
while (PeekMessage(&msg, 0, 0, 0, PM_REMOVE))
{
bool translatedAccelerator = false;
translatedAccelerator = main_window.hwnd == msg.hwnd && TranslateAccelerator(msg.hwnd, window_accelerators, &msg) != 0;
if (!translatedAccelerator)
{
TranslateMessage(&msg);
DispatchMessage(&msg);
}
}
}
ui_application_t ui_application_win32 = {
ui_application_win32_initialize,
ui_application_win32_process_events,
NULL,
false,
"win32"
};

95
ui/drivers/win32/ui_win32_browser_window.c
View File

@ -1,95 +0,0 @@
/* RetroArch - A frontend for libretro.
* Copyright (C) 2011-2017 - Daniel De Matteis
*
* RetroArch is free software: you can redistribute it and/or modify it under the terms
* of the GNU General Public License as published by the Free Software Found-
* ation, either version 3 of the License, or (at your option) any later version.
*
* RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
* without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
* PURPOSE. See the GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along with RetroArch.
* If not, see <http://www.gnu.org/licenses/>.
*/
#include <stdint.h>
#include <boolean.h>
#include <stddef.h>
#include <stdlib.h>
#include <string.h>
#include "../../gfx/common/win32_common.h"
#include <windows.h>
#include <commdlg.h>
#include <commctrl.h>
#include "../../ui_companion_driver.h"
#include "../../configuration.h"
static bool ui_browser_window_win32_core(
ui_browser_window_state_t *state, bool save)
{
OPENFILENAME ofn;
bool okay = false;
settings_t *settings = config_get_ptr();
bool video_fullscreen = settings->bools.video_fullscreen;
ofn.lStructSize = sizeof(OPENFILENAME);
ofn.hwndOwner = (HWND)state->window;
ofn.hInstance = NULL;
ofn.lpstrFilter = state->filters; /* actually const */
ofn.lpstrCustomFilter = NULL;
ofn.nMaxCustFilter = 0;
ofn.nFilterIndex = 0;
ofn.lpstrFile = state->path;
ofn.nMaxFile = PATH_MAX;
ofn.lpstrFileTitle = NULL;
ofn.nMaxFileTitle = 0;
ofn.lpstrInitialDir = state->startdir;
ofn.lpstrTitle = state->title;
ofn.Flags = OFN_FILEMUSTEXIST | OFN_HIDEREADONLY | OFN_NOCHANGEDIR;
ofn.nFileOffset = 0;
ofn.nFileExtension = 0;
ofn.lpstrDefExt = "";
ofn.lCustData = 0;
ofn.lpfnHook = NULL;
ofn.lpTemplateName = NULL;
#if (_WIN32_WINNT >= 0x0500)
ofn.pvReserved = NULL;
ofn.dwReserved = 0;
ofn.FlagsEx = 0;
#endif
/* Full Screen: Show mouse for the file dialog */
if (video_fullscreen)
video_driver_show_mouse();
okay = true;
if (!save && !GetOpenFileName(&ofn))
okay = false;
if (save && !GetSaveFileName(&ofn))
okay = false;
/* Full screen: Hide mouse after the file dialog */
if (video_fullscreen)
video_driver_hide_mouse();
return okay;
}
static bool ui_browser_window_win32_open(ui_browser_window_state_t *state)
{
return ui_browser_window_win32_core(state, false);
}
static bool ui_browser_window_win32_save(ui_browser_window_state_t *state)
{
return ui_browser_window_win32_core(state, true);
}
ui_browser_window_t ui_browser_window_win32 = {
ui_browser_window_win32_open,
ui_browser_window_win32_save,
"win32"
};

107
ui/drivers/win32/ui_win32_msg_window.c
View File

@ -1,107 +0,0 @@
/* RetroArch - A frontend for libretro.
* Copyright (C) 2011-2017 - Daniel De Matteis
*
* RetroArch is free software: you can redistribute it and/or modify it under the terms
* of the GNU General Public License as published by the Free Software Found-
* ation, either version 3 of the License, or (at your option) any later version.
*
* RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
* without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
* PURPOSE. See the GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along with RetroArch.
* If not, see <http://www.gnu.org/licenses/>.
*/
#include <stdint.h>
#include <boolean.h>
#include <stddef.h>
#include <stdlib.h>
#include <string.h>
#include <windows.h>
#include "../../ui_companion_driver.h"
static enum ui_msg_window_response ui_msg_window_win32_response(
ui_msg_window_state *state, UINT response)
{
switch (response)
{
case IDOK:
return UI_MSG_RESPONSE_OK;
case IDCANCEL:
return UI_MSG_RESPONSE_CANCEL;
case IDYES:
return UI_MSG_RESPONSE_YES;
case IDNO:
return UI_MSG_RESPONSE_NO;
default:
break;
}
switch (state->buttons)
{
case UI_MSG_WINDOW_OK:
return UI_MSG_RESPONSE_OK;
case UI_MSG_WINDOW_OKCANCEL:
return UI_MSG_RESPONSE_CANCEL;
case UI_MSG_WINDOW_YESNO:
return UI_MSG_RESPONSE_NO;
case UI_MSG_WINDOW_YESNOCANCEL:
return UI_MSG_RESPONSE_CANCEL;
default:
break;
}
return UI_MSG_RESPONSE_NA;
}
static UINT ui_msg_window_win32_buttons(ui_msg_window_state *state)
{
switch (state->buttons)
{
case UI_MSG_WINDOW_OK:
return MB_OK;
case UI_MSG_WINDOW_OKCANCEL:
return MB_OKCANCEL;
case UI_MSG_WINDOW_YESNO:
return MB_YESNO;
case UI_MSG_WINDOW_YESNOCANCEL:
return MB_YESNOCANCEL;
}
return 0;
}
static enum ui_msg_window_response ui_msg_window_win32_error(ui_msg_window_state *state)
{
UINT flags = MB_ICONERROR | ui_msg_window_win32_buttons(state);
return ui_msg_window_win32_response(state, MessageBoxA(NULL, (LPCSTR)state->text, (LPCSTR)state->title, flags));
}
static enum ui_msg_window_response ui_msg_window_win32_information(ui_msg_window_state *state)
{
UINT flags = MB_ICONINFORMATION | ui_msg_window_win32_buttons(state);
return ui_msg_window_win32_response(state, MessageBoxA(NULL, (LPCSTR)state->text, (LPCSTR)state->title, flags));
}
static enum ui_msg_window_response ui_msg_window_win32_question(ui_msg_window_state *state)
{
UINT flags = MB_ICONQUESTION | ui_msg_window_win32_buttons(state);
return ui_msg_window_win32_response(state, MessageBoxA(NULL, (LPCSTR)state->text, (LPCSTR)state->title, flags));
}
static enum ui_msg_window_response ui_msg_window_win32_warning(ui_msg_window_state *state)
{
UINT flags = MB_ICONWARNING | ui_msg_window_win32_buttons(state);
return ui_msg_window_win32_response(state, MessageBoxA(NULL, (LPCSTR)state->text, (LPCSTR)state->title, flags));
}
ui_msg_window_t ui_msg_window_win32 = {
ui_msg_window_win32_error,
ui_msg_window_win32_information,
ui_msg_window_win32_question,
ui_msg_window_win32_warning,
"win32"
};

107
ui/drivers/win32/ui_win32_window.c
View File

@ -1,107 +0,0 @@
/* RetroArch - A frontend for libretro.
* Copyright (C) 2015-2017 - Ali Bouhlel
* Copyright (C) 2011-2017 - Daniel De Matteis
*
* RetroArch is free software: you can redistribute it and/or modify it under the terms
* of the GNU General Public License as published by the Free Software Found-
* ation, either version 3 of the License, or (at your option) any later version.
*
* RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
* without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
* PURPOSE. See the GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along with RetroArch.
* If not, see <http://www.gnu.org/licenses/>.
*/
#include <stdint.h>
#include <boolean.h>
#include <stddef.h>
#include <stdlib.h>
#include <string.h>
#include <windows.h>
#ifdef _MSC_VER
#pragma comment( lib, "comctl32" )
#endif
#define IDI_ICON 1
#ifndef _WIN32_WINNT
#define _WIN32_WINNT 0x0500 //_WIN32_WINNT_WIN2K
#endif
#ifndef _WIN32_IE
#define _WIN32_IE 0x0300
#endif
#include <windows.h>
#include <commdlg.h>
#include <commctrl.h>
#include <retro_inline.h>
#include <file/file_path.h>
#include "../ui_win32.h"
#include "../../ui_companion_driver.h"
#include "../../../driver.h"
#include "../../../retroarch.h"
#include "../../../tasks/tasks_internal.h"
static void* ui_window_win32_init(void)
{
return NULL;
}
static void ui_window_win32_destroy(void *data)
{
ui_window_win32_t *window = (ui_window_win32_t*)data;
DestroyWindow(window->hwnd);
}
static void ui_window_win32_set_focused(void *data)
{
ui_window_win32_t *window = (ui_window_win32_t*)data;
SetFocus(window->hwnd);
}
static void ui_window_win32_set_visible(void *data,
bool set_visible)
{
ui_window_win32_t *window = (ui_window_win32_t*)data;
ShowWindow(window->hwnd, set_visible ? SW_SHOWNORMAL : SW_HIDE);
}
static void ui_window_win32_set_title(void *data, char *buf)
{
ui_window_win32_t *window = (ui_window_win32_t*)data;
SetWindowText(window->hwnd, buf);
}
void ui_window_win32_set_droppable(void *data, bool droppable)
{
/* Minimum supported client: Windows XP,
* minimum supported server: Windows 2000 Server */
ui_window_win32_t *window = (ui_window_win32_t*)data;
if (DragAcceptFiles_func)
DragAcceptFiles_func(window->hwnd, droppable);
}
static bool ui_window_win32_focused(void *data)
{
ui_window_win32_t *window = (ui_window_win32_t*)data;
return (GetForegroundWindow() == window->hwnd);
}
ui_window_t ui_window_win32 = {
ui_window_win32_init,
ui_window_win32_destroy,
ui_window_win32_set_focused,
ui_window_win32_set_visible,
ui_window_win32_set_title,
ui_window_win32_set_droppable,
ui_window_win32_focused,
"win32"
};

4
ui/ui_companion_driver.h
View File

@ -146,19 +146,15 @@ typedef struct ui_companion_driver
extern ui_browser_window_t ui_browser_window_cocoa; extern ui_browser_window_t ui_browser_window_cocoa;
extern ui_browser_window_t ui_browser_window_qt; extern ui_browser_window_t ui_browser_window_qt;
extern ui_browser_window_t ui_browser_window_win32;
extern ui_window_t ui_window_cocoa; extern ui_window_t ui_window_cocoa;
extern ui_window_t ui_window_qt; extern ui_window_t ui_window_qt;
extern ui_window_t ui_window_win32;
extern ui_msg_window_t ui_msg_window_win32;
extern ui_msg_window_t ui_msg_window_qt; extern ui_msg_window_t ui_msg_window_qt;
extern ui_msg_window_t ui_msg_window_cocoa; extern ui_msg_window_t ui_msg_window_cocoa;
extern ui_application_t ui_application_cocoa; extern ui_application_t ui_application_cocoa;
extern ui_application_t ui_application_qt; extern ui_application_t ui_application_qt;
extern ui_application_t ui_application_win32;
extern ui_companion_driver_t ui_companion_cocoa; extern ui_companion_driver_t ui_companion_cocoa;
extern ui_companion_driver_t ui_companion_cocoatouch; extern ui_companion_driver_t ui_companion_cocoatouch;