summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Brad Hughes <bradhugh@outlook.com>2016-06-11 12:02:22 -0400
committer Brad Hughes <bradhugh@outlook.com>2016-06-11 12:02:22 -0400
commit1f8cf36ec98b4f3fe0df3d5ab227665cee62bf90 (patch)
tree6b0e9fd9342d3e19220a190fcbd840a0e712f3c6
parent6bea81d33a449f2892d1527f6acc1e6ae8057726 (diff)
Move window_list to osd_common_t
-rw-r--r--src/osd/modules/debugger/debugwin.cpp2
-rw-r--r--src/osd/modules/debugger/win/debugwininfo.cpp2
-rw-r--r--src/osd/modules/input/input_dinput.cpp2
-rw-r--r--src/osd/modules/input/input_dinput.h2
-rw-r--r--src/osd/modules/input/input_rawinput.cpp2
-rw-r--r--src/osd/modules/input/input_sdl.cpp4
-rw-r--r--src/osd/modules/input/input_sdlcommon.cpp2
-rw-r--r--src/osd/modules/input/input_win32.cpp12
-rw-r--r--src/osd/modules/input/input_windows.h2
-rw-r--r--src/osd/modules/input/input_winhybrid.cpp2
-rw-r--r--src/osd/modules/lib/osdobj_common.cpp2
-rw-r--r--src/osd/modules/lib/osdobj_common.h3
-rw-r--r--src/osd/modules/osdwindow.cpp6
-rw-r--r--src/osd/modules/osdwindow.h2
-rw-r--r--src/osd/modules/sound/direct_sound.cpp4
-rw-r--r--src/osd/sdl/video.cpp6
-rw-r--r--src/osd/sdl/window.cpp14
-rw-r--r--src/osd/windows/video.cpp4
-rw-r--r--src/osd/windows/window.cpp52
-rw-r--r--src/osd/windows/winmain.cpp6
20 files changed, 64 insertions, 67 deletions
diff --git a/src/osd/modules/debugger/debugwin.cpp b/src/osd/modules/debugger/debugwin.cpp
index 9065f799f2e..418e24287ef 100644
--- a/src/osd/modules/debugger/debugwin.cpp
+++ b/src/osd/modules/debugger/debugwin.cpp
@@ -237,7 +237,7 @@ void debugger_windows::show_all()
void debugger_windows::hide_all()
{
- SetForegroundWindow(window_list.front()->platform_window<HWND>());
+ SetForegroundWindow(osd_common_t::s_window_list.front()->platform_window<HWND>());
for (debugwin_info &info : m_window_list)
info.hide();
}
diff --git a/src/osd/modules/debugger/win/debugwininfo.cpp b/src/osd/modules/debugger/win/debugwininfo.cpp
index 6907c13cc4f..8bb9e7592f1 100644
--- a/src/osd/modules/debugger/win/debugwininfo.cpp
+++ b/src/osd/modules/debugger/win/debugwininfo.cpp
@@ -36,7 +36,7 @@ debugwin_info::debugwin_info(debugger_windows_interface &debugger, bool is_main_
register_window_class();
m_wnd = win_create_window_ex_utf8(DEBUG_WINDOW_STYLE_EX, "MAMEDebugWindow", title, DEBUG_WINDOW_STYLE,
- 0, 0, 100, 100, window_list.front()->platform_window<HWND>(), create_standard_menubar(), GetModuleHandleUni(), this);
+ 0, 0, 100, 100, osd_common_t::s_window_list.front()->platform_window<HWND>(), create_standard_menubar(), GetModuleHandleUni(), this);
if (m_wnd == nullptr)
return;
diff --git a/src/osd/modules/input/input_dinput.cpp b/src/osd/modules/input/input_dinput.cpp
index 9948dc6c40d..5ce00b93a06 100644
--- a/src/osd/modules/input/input_dinput.cpp
+++ b/src/osd/modules/input/input_dinput.cpp
@@ -574,7 +574,7 @@ public:
dinput_joystick_device *devinfo;
int result = 0;
- if (!window_list.empty() && window_list.front()->win_has_menu())
+ if (!osd_common_t::s_window_list.empty() && osd_common_t::s_window_list.front()->win_has_menu())
cooperative_level = DISCL_BACKGROUND | DISCL_NONEXCLUSIVE;
// allocate and link in a new device
diff --git a/src/osd/modules/input/input_dinput.h b/src/osd/modules/input/input_dinput.h
index ae276696f63..6a8eba3e24a 100644
--- a/src/osd/modules/input/input_dinput.h
+++ b/src/osd/modules/input/input_dinput.h
@@ -117,7 +117,7 @@ public:
}
// set the cooperative level
- result = devinfo->dinput.device->SetCooperativeLevel(window_list.front()->platform_window<HWND>(), cooperative_level);
+ result = devinfo->dinput.device->SetCooperativeLevel(osd_common_t::s_window_list.front()->platform_window<HWND>(), cooperative_level);
if (result != DI_OK)
goto error;
diff --git a/src/osd/modules/input/input_rawinput.cpp b/src/osd/modules/input/input_rawinput.cpp
index 3188d5cf3c9..ecfae316d41 100644
--- a/src/osd/modules/input/input_rawinput.cpp
+++ b/src/osd/modules/input/input_rawinput.cpp
@@ -475,7 +475,7 @@ public:
registration.usUsagePage = usagepage();
registration.usUsage = usage();
registration.dwFlags = m_global_inputs_enabled ? 0x00000100 : 0;
- registration.hwndTarget = window_list.front()->platform_window<HWND>();
+ registration.hwndTarget = osd_common_t::s_window_list.front()->platform_window<HWND>();
// register the device
register_rawinput_devices(&registration, 1, sizeof(registration));
diff --git a/src/osd/modules/input/input_sdl.cpp b/src/osd/modules/input/input_sdl.cpp
index 96bd90f6a31..64e30302a3e 100644
--- a/src/osd/modules/input/input_sdl.cpp
+++ b/src/osd/modules/input/input_sdl.cpp
@@ -144,7 +144,7 @@ public:
case SDL_KEYDOWN:
keyboard.state[OSD_SDL_INDEX_KEYSYM(&sdlevent.key.keysym)] = 0x80;
if (sdlevent.key.keysym.sym < 0x20)
- machine().ui_input().push_char_event(window_list.front()->target(), sdlevent.key.keysym.sym);
+ machine().ui_input().push_char_event(osd_common_t::s_window_list.front()->target(), sdlevent.key.keysym.sym);
break;
case SDL_KEYUP:
@@ -155,7 +155,7 @@ public:
if (*sdlevent.text.text)
{
auto window = GET_FOCUS_WINDOW(&event.text);
- //printf("Focus window is %p - wl %p\n", window, window_list);
+ //printf("Focus window is %p - wl %p\n", window, osd_common_t::s_window_list);
if (window != nullptr)
{
auto ptr = sdlevent.text.text;
diff --git a/src/osd/modules/input/input_sdlcommon.cpp b/src/osd/modules/input/input_sdlcommon.cpp
index bd3008d2054..479e5975666 100644
--- a/src/osd/modules/input/input_sdlcommon.cpp
+++ b/src/osd/modules/input/input_sdlcommon.cpp
@@ -39,7 +39,7 @@ static inline std::shared_ptr<sdl_window_info> window_from_id(Uint32 windowID)
{
SDL_Window *window = SDL_GetWindowFromID(windowID);
- for (auto w : window_list)
+ for (auto w : osd_common_t::s_window_list)
{
//printf("w->window_id: %d\n", w->window_id);
if (w->platform_window<SDL_Window*>() == window)
diff --git a/src/osd/modules/input/input_win32.cpp b/src/osd/modules/input/input_win32.cpp
index 780d235be58..0a51e68e4d7 100644
--- a/src/osd/modules/input/input_win32.cpp
+++ b/src/osd/modules/input/input_win32.cpp
@@ -152,7 +152,7 @@ public:
mouse.lY = (cursor_info.ptScreenPos.y - win32_mouse.last_point.y) * INPUT_RELATIVE_PER_PIXEL;
RECT window_pos = {0};
- GetWindowRect(window_list.front()->platform_window<HWND>(), &window_pos);
+ GetWindowRect(osd_common_t::s_window_list.front()->platform_window<HWND>(), &window_pos);
// We reset the cursor position to the middle of the window each frame
win32_mouse.last_point.x = window_pos.left + (window_pos.right - window_pos.left) / 2;
@@ -269,13 +269,13 @@ public:
// get the cursor position and transform into final results
GetCursorPos(&mousepos);
- if (!window_list.empty())
+ if (!osd_common_t::s_window_list.empty())
{
RECT client_rect;
// get the position relative to the window
- GetClientRect(window_list.front()->platform_window<HWND>(), &client_rect);
- ScreenToClient(window_list.front()->platform_window<HWND>(), &mousepos);
+ GetClientRect(osd_common_t::s_window_list.front()->platform_window<HWND>(), &client_rect);
+ ScreenToClient(osd_common_t::s_window_list.front()->platform_window<HWND>(), &mousepos);
// convert to absolute coordinates
xpos = normalize_absolute_axis(mousepos.x, client_rect.left, client_rect.right);
@@ -335,10 +335,10 @@ private:
POINT mousepos;
// get the position relative to the window
- GetClientRect(window_list.front()->platform_window<HWND>(), &client_rect);
+ GetClientRect(osd_common_t::s_window_list.front()->platform_window<HWND>(), &client_rect);
mousepos.x = args.xpos;
mousepos.y = args.ypos;
- ScreenToClient(window_list.front()->platform_window<HWND>(), &mousepos);
+ ScreenToClient(osd_common_t::s_window_list.front()->platform_window<HWND>(), &mousepos);
// convert to absolute coordinates
mouse.lX = normalize_absolute_axis(mousepos.x, client_rect.left, client_rect.right);
diff --git a/src/osd/modules/input/input_windows.h b/src/osd/modules/input/input_windows.h
index e22054acc07..56eaae0fd78 100644
--- a/src/osd/modules/input/input_windows.h
+++ b/src/osd/modules/input/input_windows.h
@@ -52,7 +52,7 @@ public:
virtual bool should_hide_mouse()
{
if (winwindow_has_focus() // has focus
- && (!video_config.windowed || !window_list.front()->win_has_menu()) // not windowed or doesn't have a menu
+ && (!video_config.windowed || !osd_common_t::s_window_list.front()->win_has_menu()) // not windowed or doesn't have a menu
&& (input_enabled() && !input_paused()) // input enabled and not paused
&& (mouse_enabled() || lightgun_enabled())) // either mouse or lightgun enabled in the core
{
diff --git a/src/osd/modules/input/input_winhybrid.cpp b/src/osd/modules/input/input_winhybrid.cpp
index 821f9217d46..968edbf1624 100644
--- a/src/osd/modules/input/input_winhybrid.cpp
+++ b/src/osd/modules/input/input_winhybrid.cpp
@@ -167,7 +167,7 @@ public:
goto exit;
}
- if (!window_list.empty() && window_list.front()->win_has_menu())
+ if (!osd_common_t::s_window_list.empty() && osd_common_t::s_window_list.front()->win_has_menu())
cooperative_level = DISCL_BACKGROUND | DISCL_NONEXCLUSIVE;
// allocate and link in a new device
diff --git a/src/osd/modules/lib/osdobj_common.cpp b/src/osd/modules/lib/osdobj_common.cpp
index 61aec1b49d3..b54756d1847 100644
--- a/src/osd/modules/lib/osdobj_common.cpp
+++ b/src/osd/modules/lib/osdobj_common.cpp
@@ -159,6 +159,8 @@ osd_options::osd_options()
add_entries(osd_options::s_option_entries);
}
+// Window list
+std::list<std::shared_ptr<osd_window>> osd_common_t::s_window_list;
//-------------------------------------------------
// osd_interface - constructor
diff --git a/src/osd/modules/lib/osdobj_common.h b/src/osd/modules/lib/osdobj_common.h
index 5bb2fc994ec..cc36320f53a 100644
--- a/src/osd/modules/lib/osdobj_common.h
+++ b/src/osd/modules/lib/osdobj_common.h
@@ -164,6 +164,7 @@ private:
};
// ======================> osd_interface
+class osd_window;
// description of the currently-running machine
class osd_common_t : public osd_interface, osd_output
@@ -237,6 +238,8 @@ public:
void set_verbose(bool print_verbose) { m_print_verbose = print_verbose; }
void notify(const char *outname, INT32 value) const { m_output->notify(outname, value); }
+
+ static std::list<std::shared_ptr<osd_window>> s_window_list;
protected:
virtual bool input_init();
virtual void input_pause();
diff --git a/src/osd/modules/osdwindow.cpp b/src/osd/modules/osdwindow.cpp
index 83ceade2c71..c7afccb029c 100644
--- a/src/osd/modules/osdwindow.cpp
+++ b/src/osd/modules/osdwindow.cpp
@@ -21,12 +21,6 @@
#include "render/drawsdl.h"
#endif
-//============================================================
-// GLOBAL VARIABLES
-//============================================================
-
-std::list<std::shared_ptr<osd_window>> window_list;
-
std::unique_ptr<osd_renderer> osd_renderer::make_for_type(int mode, std::shared_ptr<osd_window> window, int extra_flags)
{
switch(mode)
diff --git a/src/osd/modules/osdwindow.h b/src/osd/modules/osdwindow.h
index 054286d84b5..eefde3baf49 100644
--- a/src/osd/modules/osdwindow.h
+++ b/src/osd/modules/osdwindow.h
@@ -341,6 +341,4 @@ struct osd_video_config
extern osd_video_config video_config;
-extern std::list<std::shared_ptr<osd_window>> window_list;
-
#endif /* __OSDWINDOW__ */
diff --git a/src/osd/modules/sound/direct_sound.cpp b/src/osd/modules/sound/direct_sound.cpp
index ec2cb17e38e..04d29866876 100644
--- a/src/osd/modules/sound/direct_sound.cpp
+++ b/src/osd/modules/sound/direct_sound.cpp
@@ -404,10 +404,10 @@ HRESULT sound_direct_sound::dsound_init()
#ifdef SDLMAME_WIN32
SDL_SysWMinfo wminfo;
SDL_VERSION(&wminfo.version);
- SDL_GetWindowWMInfo(window_list.front()->platform_window<SDL_Window*>(), &wminfo);
+ SDL_GetWindowWMInfo(osd_common_t::s_window_list.front()->platform_window<SDL_Window*>(), &wminfo);
HWND const window = wminfo.info.win.window;
#else // SDLMAME_WIN32
- HWND const window = window_list.front()->platform_window<HWND>();
+ HWND const window = osd_common_t::s_window_list.front()->platform_window<HWND>();
#endif // SDLMAME_WIN32
result = m_dsound->SetCooperativeLevel(window, DSSCL_PRIORITY);
}
diff --git a/src/osd/sdl/video.cpp b/src/osd/sdl/video.cpp
index 9b777fa66f4..a9a1b592bc6 100644
--- a/src/osd/sdl/video.cpp
+++ b/src/osd/sdl/video.cpp
@@ -140,7 +140,7 @@ void sdl_osd_interface::update(bool skip_redraw)
if (!skip_redraw)
{
// profiler_mark(PROFILER_BLIT);
- for (auto window : window_list)
+ for (auto window : osd_common_t::s_window_list)
window->update();
// profiler_mark(PROFILER_END);
}
@@ -273,11 +273,11 @@ static void check_osd_inputs(running_machine &machine)
// check for toggling fullscreen mode
if (machine.ui_input().pressed(IPT_OSD_1))
{
- for (auto curwin : window_list)
+ for (auto curwin : osd_common_t::s_window_list)
std::static_pointer_cast<sdl_window_info>(curwin)->toggle_full_screen();
}
- auto window = window_list.front();
+ auto window = osd_common_t::s_window_list.front();
if (machine.ui_input().pressed(IPT_OSD_2))
{
//FIXME: on a per window basis
diff --git a/src/osd/sdl/window.cpp b/src/osd/sdl/window.cpp
index d6ed97494ca..fd4bc8943f2 100644
--- a/src/osd/sdl/window.cpp
+++ b/src/osd/sdl/window.cpp
@@ -148,7 +148,7 @@ bool sdl_osd_interface::window_init()
void sdl_osd_interface::update_slider_list()
{
- for (auto window : window_list)
+ for (auto window : osd_common_t::s_window_list)
{
// check if any window has dirty sliders
if (window->renderer().sliders_dirty())
@@ -163,7 +163,7 @@ void sdl_osd_interface::build_slider_list()
{
m_sliders.clear();
- for (auto window : window_list)
+ for (auto window : osd_common_t::s_window_list)
{
std::vector<ui::menu_item> window_sliders = window->renderer().get_slider_list();
m_sliders.insert(m_sliders.end(), window_sliders.begin(), window_sliders.end());
@@ -180,9 +180,9 @@ void sdl_osd_interface::window_exit()
osd_printf_verbose("Enter sdlwindow_exit\n");
// free all the windows
- while (!window_list.empty())
+ while (!osd_common_t::s_window_list.empty())
{
- auto window = window_list.front();
+ auto window = osd_common_t::s_window_list.front();
// Part of destroy removes the window from the list
window->destroy();
@@ -393,7 +393,7 @@ int sdl_window_info::window_init()
m_startmaximized = options.maximize();
// add us to the list
- window_list.push_back(std::static_pointer_cast<sdl_window_info>(shared_from_this()));
+ osd_common_t::s_window_list.push_back(std::static_pointer_cast<sdl_window_info>(shared_from_this()));
set_renderer(osd_renderer::make_for_type(video_config.mode, static_cast<osd_window*>(this)->shared_from_this()));
@@ -445,7 +445,7 @@ void sdl_window_info::destroy()
//osd_event_wait(window->rendered_event, osd_ticks_per_second()*10);
// remove us from the list
- window_list.remove(std::static_pointer_cast<sdl_window_info>(shared_from_this()));
+ osd_common_t::s_window_list.remove(std::static_pointer_cast<sdl_window_info>(shared_from_this()));
// free the textures etc
complete_destroy();
@@ -767,7 +767,7 @@ int sdl_window_info::complete_create()
// set main window
if (m_index > 0)
{
- for (auto w : window_list)
+ for (auto w : osd_common_t::s_window_list)
{
if (w->m_index == 0)
{
diff --git a/src/osd/windows/video.cpp b/src/osd/windows/video.cpp
index 1a8860c7550..5d42b4d7f7b 100644
--- a/src/osd/windows/video.cpp
+++ b/src/osd/windows/video.cpp
@@ -80,7 +80,7 @@ bool windows_osd_interface::video_init()
}
if (video_config.mode != VIDEO_MODE_NONE)
- SetForegroundWindow(window_list.front()->platform_window<HWND>());
+ SetForegroundWindow(osd_common_t::s_window_list.front()->platform_window<HWND>());
return true;
}
@@ -169,7 +169,7 @@ void windows_osd_interface::update(bool skip_redraw)
if (!skip_redraw)
{
// profiler_mark(PROFILER_BLIT);
- for (auto window : window_list)
+ for (auto window : osd_common_t::s_window_list)
window->update();
// profiler_mark(PROFILER_END);
}
diff --git a/src/osd/windows/window.cpp b/src/osd/windows/window.cpp
index f9b093506f1..ffcf2704a75 100644
--- a/src/osd/windows/window.cpp
+++ b/src/osd/windows/window.cpp
@@ -208,7 +208,7 @@ bool windows_osd_interface::window_init()
void windows_osd_interface::update_slider_list()
{
- for (auto window : window_list)
+ for (auto window : osd_common_t::s_window_list)
{
// check if any window has dirty sliders
if (window->renderer().sliders_dirty())
@@ -221,14 +221,14 @@ void windows_osd_interface::update_slider_list()
int windows_osd_interface::window_count()
{
- return window_list.size();
+ return osd_common_t::s_window_list.size();
}
void windows_osd_interface::build_slider_list()
{
m_sliders.clear();
- for (auto window : window_list)
+ for (auto window : osd_common_t::s_window_list)
{
// take the sliders of the first window
std::vector<ui::menu_item> window_sliders = window->renderer().get_slider_list();
@@ -238,7 +238,7 @@ void windows_osd_interface::build_slider_list()
void windows_osd_interface::add_audio_to_recording(const INT16 *buffer, int samples_this_frame)
{
- auto window = window_list.front(); // We only record on the first window
+ auto window = osd_common_t::s_window_list.front(); // We only record on the first window
if (window != nullptr)
{
window->renderer().add_audio_to_recording(buffer, samples_this_frame);
@@ -255,13 +255,13 @@ void windows_osd_interface::window_exit()
assert(GetCurrentThreadId() == main_threadid);
// if we hid the cursor during the emulation, show it
- if (!window_list.empty())
- window_list.front()->show_pointer();
+ if (!osd_common_t::s_window_list.empty())
+ osd_common_t::s_window_list.front()->show_pointer();
// free all the windows
- while (!window_list.empty())
+ while (!osd_common_t::s_window_list.empty())
{
- auto window = window_list.front();
+ auto window = osd_common_t::s_window_list.front();
// Destroy removes it from the list also
window->destroy();
@@ -417,7 +417,7 @@ void winwindow_process_events_periodic(running_machine &machine)
static BOOL is_mame_window(HWND hwnd)
{
- for (auto window : window_list)
+ for (auto window : osd_common_t::s_window_list)
if (window->platform_window<HWND>() == hwnd)
return TRUE;
@@ -581,7 +581,7 @@ void winwindow_take_snap(void)
assert(GetCurrentThreadId() == main_threadid);
// iterate over windows and request a snap
- for (auto window : window_list)
+ for (auto window : osd_common_t::s_window_list)
{
window->renderer().save();
}
@@ -599,7 +599,7 @@ void winwindow_toggle_fsfx(void)
assert(GetCurrentThreadId() == main_threadid);
// iterate over windows and request a snap
- for (auto window : window_list)
+ for (auto window : osd_common_t::s_window_list)
{
window->renderer().toggle_fsfx();
}
@@ -617,7 +617,7 @@ void winwindow_take_video(void)
assert(GetCurrentThreadId() == main_threadid);
// iterate over windows and request a snap
- for (auto window : window_list)
+ for (auto window : osd_common_t::s_window_list)
{
window->renderer().record();
}
@@ -635,7 +635,7 @@ void winwindow_toggle_full_screen(void)
assert(GetCurrentThreadId() == main_threadid);
// if we are in debug mode, never go full screen
- for (auto window : window_list)
+ for (auto window : osd_common_t::s_window_list)
if (window->machine().debug_flags & DEBUG_FLAG_OSD_ENABLED)
return;
@@ -643,11 +643,11 @@ void winwindow_toggle_full_screen(void)
video_config.windowed = !video_config.windowed;
// iterate over windows and toggle their fullscreen state
- for (auto window : window_list)
+ for (auto window : osd_common_t::s_window_list)
SendMessage(window->platform_window<HWND>(), WM_USER_SET_FULLSCREEN, !video_config.windowed, 0);
// Set the first window as foreground
- SetForegroundWindow(window_list.front()->platform_window<HWND>());
+ SetForegroundWindow(osd_common_t::s_window_list.front()->platform_window<HWND>());
}
@@ -662,7 +662,7 @@ BOOL winwindow_has_focus(void)
HWND focuswnd = GetFocus();
// see if one of the video windows has focus
- for (auto window : window_list)
+ for (auto window : osd_common_t::s_window_list)
if (focuswnd == window->platform_window<HWND>())
return TRUE;
@@ -680,10 +680,10 @@ void winwindow_update_cursor_state(running_machine &machine)
assert(GetCurrentThreadId() == main_threadid);
// If no windows, just return
- if (window_list.empty())
+ if (osd_common_t::s_window_list.empty())
return;
- auto window = window_list.front();
+ auto window = osd_common_t::s_window_list.front();
// if we should hide the mouse cursor, then do it
// rules are:
@@ -728,7 +728,7 @@ void win_window_info::create(running_machine &machine, int index, osd_monitor_in
// set main window
if (window->m_index > 0)
{
- for (auto w : window_list)
+ for (auto w : osd_common_t::s_window_list)
{
if (w->m_index == 0)
{
@@ -745,12 +745,12 @@ void win_window_info::create(running_machine &machine, int index, osd_monitor_in
// see if we are safe for fullscreen
window->m_fullscreen_safe = TRUE;
- for (auto win : window_list)
+ for (auto win : osd_common_t::s_window_list)
if (win->monitor() == monitor)
window->m_fullscreen_safe = FALSE;
// add us to the list
- window_list.push_back(window);
+ osd_common_t::s_window_list.push_back(window);
// load the layout
window->m_target = machine.render().target_alloc();
@@ -794,7 +794,7 @@ void win_window_info::destroy()
assert(GetCurrentThreadId() == main_threadid);
// remove us from the list
- window_list.remove(shared_from_this());
+ osd_common_t::s_window_list.remove(shared_from_this());
// destroy the window
if (platform_window<HWND>() != nullptr)
@@ -1082,7 +1082,7 @@ int win_window_info::complete_create()
fullscreen() ? FULLSCREEN_STYLE : WINDOW_STYLE,
monitorbounds.left() + 20, monitorbounds.top() + 20,
monitorbounds.left() + 100, monitorbounds.top() + 100,
- nullptr,//(window_list != nullptr) ? window_list->m_hwnd : nullptr,
+ nullptr,//(osd_common_t::s_window_list != nullptr) ? osd_common_t::s_window_list->m_hwnd : nullptr,
menu,
GetModuleHandleUni(),
nullptr);
@@ -1360,8 +1360,8 @@ LRESULT CALLBACK win_window_info::video_window_proc(HWND wnd, UINT message, WPAR
// set focus: if we're not the primary window, switch back
// commented out ATM because this prevents us from resizing secondary windows
// case WM_SETFOCUS:
-// if (window != window_list && window_list != nullptr)
-// SetFocus(window_list->m_hwnd);
+// if (window != osd_common_t::s_window_list && osd_common_t::s_window_list != nullptr)
+// SetFocus(osd_common_t::s_window_list->m_hwnd);
// break;
// everything else: defaults
@@ -1839,7 +1839,7 @@ bool winwindow_qt_filter(void *message)
if(msg->hwnd) // get the machine associated with this window
ptr = GetWindowLongPtr(msg->hwnd, GWLP_USERDATA);
else // any one will have to do
- ptr = (LONG_PTR)window_list;
+ ptr = (LONG_PTR)osd_common_t::s_window_list;
winwindow_dispatch_message(((win_window_info *)ptr)->machine(), msg);
return true;
diff --git a/src/osd/windows/winmain.cpp b/src/osd/windows/winmain.cpp
index 2e714315769..f4197d31e55 100644
--- a/src/osd/windows/winmain.cpp
+++ b/src/osd/windows/winmain.cpp
@@ -71,11 +71,11 @@ public:
char buffer[1024];
// if we are in fullscreen mode, go to windowed mode
- if ((video_config.windowed == 0) && !window_list.empty())
+ if ((video_config.windowed == 0) && !osd_common_t::s_window_list.empty())
winwindow_toggle_full_screen();
vsnprintf(buffer, ARRAY_LENGTH(buffer), msg, args);
- win_message_box_utf8(!window_list.empty() ? window_list.front()->platform_window<HWND>() : nullptr, buffer, emulator_info::get_appname(), MB_OK);
+ win_message_box_utf8(!osd_common_t::s_window_list.empty() ? osd_common_t::s_window_list.front()->platform_window<HWND>() : nullptr, buffer, emulator_info::get_appname(), MB_OK);
}
else
chain_output(channel, msg, args);
@@ -519,7 +519,7 @@ void windows_osd_interface::init(running_machine &machine)
osd_common_t::init_subsystems();
// notify listeners of screen configuration
- for (auto info : window_list)
+ for (auto info : osd_common_t::s_window_list)
{
machine.output().set_value(string_format("Orientation(%s)", info->monitor()->devicename()).c_str(), std::static_pointer_cast<win_window_info>(info)->m_targetorient);
}