mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-11 00:44:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Create separate WndProc for GL and D3D

Browse Source
This commit is contained in:
twinaphex 2015-11-28 21:50:28 +01:00
parent ec9a2adf8d
commit ef3cbed13e
5 changed files with 83 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
gfx/common/win32_common.cpp
View File

@ -176,12 +176,10 @@ static const char *win32_video_get_ident(void)
extern "C" {
#endif
LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
LRESULT CALLBACK WndProcD3D(HWND hwnd, UINT message,
WPARAM wparam, LPARAM lparam)
{
settings_t *settings = config_get_ptr();
driver_t *driver = driver_get_ptr();
const char *video_driver = win32_video_get_ident();
switch (message)
{
@ -203,15 +201,8 @@ LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
return win32_handle_keyboard_event(hwnd, message, wparam, lparam);
case WM_CREATE:
if (!strcmp(video_driver, "gl"))
{
create_gl_context(hwnd, &g_quit);
}
else if (!strcmp(video_driver, "d3d"))
{
LPCREATESTRUCT p_cs = (LPCREATESTRUCT)lparam;
curD3D = p_cs->lpCreateParams;
}
LPCREATESTRUCT p_cs = (LPCREATESTRUCT)lparam;
curD3D = p_cs->lpCreateParams;
return 0;
case WM_CLOSE:
@ -238,15 +229,72 @@ LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
if (settings->ui.menubar_enable)
{
HWND d3dr = g_hwnd;
if (!strcmp(video_driver, "d3d"))
d3dr = g_hwnd;
LRESULT ret = win32_menu_loop(d3dr, wparam);
(void)ret;
}
break;
}
if (dinput_handle_message((!strcmp(video_driver, "gl")) ? dinput_wgl : dinput, message, wparam, lparam))
if (dinput_handle_message(dinput, message, wparam, lparam))
return 0;
return DefWindowProc(hwnd, message, wparam, lparam);
}
LRESULT CALLBACK WndProcGL(HWND hwnd, UINT message,
WPARAM wparam, LPARAM lparam)
{
settings_t *settings = config_get_ptr();
switch (message)
{
case WM_SYSCOMMAND:
/* Prevent screensavers, etc, while running. */
switch (wparam)
{
case SC_SCREENSAVE:
case SC_MONITORPOWER:
return 0;
}
break;
case WM_CHAR:
case WM_KEYDOWN:
case WM_KEYUP:
case WM_SYSKEYUP:
case WM_SYSKEYDOWN:
return win32_handle_keyboard_event(hwnd, message, wparam, lparam);
case WM_CREATE:
create_gl_context(hwnd, &g_quit);
return 0;
case WM_CLOSE:
case WM_DESTROY:
case WM_QUIT:
{
WINDOWPLACEMENT placement;
GetWindowPlacement(g_hwnd, &placement);
g_pos_x = placement.rcNormalPosition.left;
g_pos_y = placement.rcNormalPosition.top;
g_quit = true;
return 0;
}
case WM_SIZE:
/* Do not send resize message if we minimize. */
if (wparam != SIZE_MAXHIDE && wparam != SIZE_MINIMIZED)
{
g_resize_width = LOWORD(lparam);
g_resize_height = HIWORD(lparam);
g_resized = true;
}
return 0;
case WM_COMMAND:
if (settings->ui.menubar_enable)
win32_menu_loop(g_hwnd, wparam);
break;
}
if (dinput_handle_message(dinput_wgl, message, wparam, lparam))
return 0;
return DefWindowProc(hwnd, message, wparam, lparam);
}

14
gfx/common/win32_common.h
View File

@ -99,6 +99,20 @@ void win32_window_reset(void);
void win32_destroy_window(void);
#ifndef _MSC_VER
extern "C" {
#endif
LRESULT CALLBACK WndProcD3D(HWND hwnd, UINT message,
WPARAM wparam, LPARAM lparam);
LRESULT CALLBACK WndProcGL(HWND hwnd, UINT message,
WPARAM wparam, LPARAM lparam);
#ifndef _MSC_VER
}
#endif
#ifdef _XBOX
BOOL IsIconic(HWND hwnd);
#endif

1
gfx/d3d/d3d.cpp
View File

@ -571,6 +571,7 @@ static bool d3d_construct(d3d_video_t *d3d,
memset(&d3d->windowClass, 0, sizeof(d3d->windowClass));
#ifndef _XBOX
d3d->windowClass.lpfnWndProc = WndProcD3D;
win32_window_init(&d3d->windowClass, true, NULL);
#endif

2
gfx/drivers_context/wgl_ctx.cpp
View File

@ -307,6 +307,8 @@ static bool gfx_ctx_wgl_init(void *data)
win32_window_reset();
win32_monitor_init();
wndclass.lpfnWndProc = WndProcGL;
if (!win32_window_init(&wndclass, true, NULL))
return false;

7
ui/drivers/ui_win32.c
View File

@ -113,7 +113,8 @@ typedef struct
int parameters_start_y;
} shader_dlg_t;
extern LRESULT CALLBACK WndProc(HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam);
extern LRESULT CALLBACK WndProcGL(HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam);
extern LRESULT CALLBACK WndProcD3D(HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam);
static shader_dlg_t g_shader_dlg = {0};
@ -387,9 +388,7 @@ bool win32_window_init(WNDCLASSEX *wndclass, bool fullscreen, const char *class_
if (!fullscreen)
wndclass->hbrBackground = (HBRUSH)COLOR_WINDOW;
if (class_name == NULL)
wndclass->lpfnWndProc = WndProc;
else
if (class_name != NULL)
wndclass->style |= CS_CLASSDC;
if (!RegisterClassEx(wndclass))