mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-01-27 03:35:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Compile in win32_monitor_ functions for Xbox too but leave them

Browse Source 
stub
This commit is contained in:
twinaphex 2015-11-12 01:22:28 +01:00
parent 61f0464b77
commit cb5d4b0569
5 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
gfx/common/win32_common.cpp
View File

@ -96,13 +96,6 @@ static BOOL CALLBACK win32_monitor_enum_proc(HMONITOR hMonitor,
return TRUE;
}
void win32_monitor_init(void)
{
win32_monitor_count = 0;
EnumDisplayMonitors(NULL, NULL, win32_monitor_enum_proc, 0);
g_quit = false;
}
void win32_monitor_from_window(HWND data, bool destroy)
{
@ -247,6 +240,7 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
bool win32_window_init(WNDCLASSEX *wndclass, bool fullscreen)
{
#ifndef _XBOX
wndclass->cbSize = sizeof(WNDCLASSEX);
wndclass->style = CS_HREDRAW | CS_VREDRAW | CS_OWNDC;
wndclass->lpfnWndProc = WndProc;
@ -261,6 +255,7 @@ bool win32_window_init(WNDCLASSEX *wndclass, bool fullscreen)
if (!RegisterClassEx(wndclass))
return false;
#endif
return true;
}
@ -451,6 +446,16 @@ bool win32_get_metrics(void *data,
#endif
}
void win32_monitor_init(void)
{
#ifndef _XBOX
win32_monitor_count = 0;
EnumDisplayMonitors(NULL, NULL, win32_monitor_enum_proc, 0);
#endif
g_quit = false;
}
void win32_show_cursor(bool state)
{
#ifndef _XBOX

7
gfx/common/win32_common.h
View File

@ -44,7 +44,6 @@ LRESULT win32_handle_keyboard_event(HWND hwnd, UINT message,
LRESULT win32_menu_loop(HWND handle, WPARAM wparam);
void win32_monitor_init(void);
void win32_monitor_from_window(HWND data, bool destroy);
@ -52,11 +51,13 @@ void win32_monitor_get_info(void);
void win32_monitor_info(void *data, void *hm_data, unsigned *mon_id);
bool win32_window_init(WNDCLASSEX *wndclass, bool fullscreen);
void create_gl_context(HWND hwnd);
#endif
void win32_monitor_init(void);
bool win32_window_init(WNDCLASSEX *wndclass, bool fullscreen);
bool win32_suppress_screensaver(void *data, bool enable);
bool win32_get_metrics(void *data,

3
gfx/d3d/d3d.cpp
View File

@ -593,11 +593,8 @@ static bool d3d_construct(d3d_video_t *d3d,
d3d->menu->vert_coords[3] = -1;
#endif
#if defined(HAVE_WINDOW) && !defined(_XBOX)
memset(&d3d->windowClass, 0, sizeof(d3d->windowClass));
win32_window_init(&d3d->windowClass, true);
#endif
#ifdef HAVE_MONITOR
bool windowed_full;

2
gfx/d3d/d3d.h
View File

@ -98,9 +98,7 @@ typedef struct d3d_video
bool quitting;
struct video_viewport vp;
#ifdef HAVE_WINDOW
WNDCLASSEX windowClass;
#endif
HWND hWnd;
LPDIRECT3D g_pD3D;
LPDIRECT3DDEVICE dev;

2
gfx/drivers_context/d3d_ctx.cpp
View File

@ -177,9 +177,7 @@ static bool gfx_ctx_d3d_init(void *data)
{
(void)data;
#ifndef _XBOX
win32_monitor_init();
#endif
return true;
}