Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-07-04 09:28:51 +03:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Use std::chrono instead of GetTickCount in window.cpp/h for Windows OSD

Browse Source
This commit is contained in:
Brad Hughes 2016-04-15 22:55:01 -04:00
parent 6d27bfb25d
commit f7c9b7095e
2 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/osd/windows/window.cpp
View File

@ -16,6 +16,7 @@
#include <process.h> #include <process.h>
#include <atomic> #include <atomic>
#include <chrono>
// MAME headers // MAME headers
#include "emu.h" #include "emu.h"
@ -43,6 +44,9 @@
#define MAKE_DI_SCAN(scan, isextended) (scan & 0x7f) | (isextended ? 0x80 : 0x00) #define MAKE_DI_SCAN(scan, isextended) (scan & 0x7f) | (isextended ? 0x80 : 0x00)
#define WINOSD(machine) downcast<windows_osd_interface*>(&machine.osd()) #define WINOSD(machine) downcast<windows_osd_interface*>(&machine.osd())
// min(x, y) macro interferes with chrono time_point::min()
#undef min
//============================================================ //============================================================
// PARAMETERS // PARAMETERS
//============================================================ //============================================================
@ -93,7 +97,7 @@ static int win_physical_height;
//============================================================ //============================================================
// event handling // event handling
static DWORD last_event_check; static std::chrono::system_clock::time_point last_event_check;
// debugger // debugger
static int in_background; static int in_background;
@ -348,7 +352,7 @@ win_window_info::win_window_info(running_machine &machine)
m_target(nullptr), m_target(nullptr),
m_targetview(0), m_targetview(0),
m_targetorient(0), m_targetorient(0),
m_lastclicktime(0), m_lastclicktime(std::chrono::system_clock::time_point::min()),
m_lastclickx(0), m_lastclickx(0),
m_lastclicky(0), m_lastclicky(0),
m_renderer(nullptr), m_renderer(nullptr),
@ -378,12 +382,12 @@ win_window_info::~win_window_info()
void winwindow_process_events_periodic(running_machine &machine) void winwindow_process_events_periodic(running_machine &machine)
{ {
DWORD currticks = GetTickCount(); auto currticks = std::chrono::system_clock::now();
assert(GetCurrentThreadId() == main_threadid); assert(GetCurrentThreadId() == main_threadid);
// update once every 1/8th of a second // update once every 1/8th of a second
if (currticks - last_event_check < 1000 / 8) if (currticks - last_event_check < std::chrono::milliseconds(1000 / 8))
return; return;
winwindow_process_events(machine, TRUE, FALSE); winwindow_process_events(machine, TRUE, FALSE);
} }
@ -441,7 +445,7 @@ void winwindow_process_events(running_machine &machine, int ingame, bool nodispa
assert(GetCurrentThreadId() == main_threadid); assert(GetCurrentThreadId() == main_threadid);
// remember the last time we did this // remember the last time we did this
last_event_check = GetTickCount(); last_event_check = std::chrono::system_clock::now();
do do
{ {
@ -1348,15 +1352,15 @@ LRESULT CALLBACK win_window_info::video_window_proc(HWND wnd, UINT message, WPAR
case WM_LBUTTONDOWN: case WM_LBUTTONDOWN:
{ {
DWORD ticks = GetTickCount(); auto ticks = std::chrono::system_clock::now();
window->machine().ui_input().push_mouse_down_event(window->m_target, GET_X_LPARAM(lparam), GET_Y_LPARAM(lparam)); window->machine().ui_input().push_mouse_down_event(window->m_target, GET_X_LPARAM(lparam), GET_Y_LPARAM(lparam));
// check for a double-click // check for a double-click
if (ticks - window->m_lastclicktime < GetDoubleClickTime() && if (ticks - window->m_lastclicktime < std::chrono::milliseconds(GetDoubleClickTime()) &&
GET_X_LPARAM(lparam) >= window->m_lastclickx - 4 && GET_X_LPARAM(lparam) <= window->m_lastclickx + 4 && GET_X_LPARAM(lparam) >= window->m_lastclickx - 4 && GET_X_LPARAM(lparam) <= window->m_lastclickx + 4 &&
GET_Y_LPARAM(lparam) >= window->m_lastclicky - 4 && GET_Y_LPARAM(lparam) <= window->m_lastclicky + 4) GET_Y_LPARAM(lparam) >= window->m_lastclicky - 4 && GET_Y_LPARAM(lparam) <= window->m_lastclicky + 4)
{ {
window->m_lastclicktime = 0; window->m_lastclicktime = std::chrono::system_clock::time_point::min();
window->machine().ui_input().push_mouse_double_click_event(window->m_target, GET_X_LPARAM(lparam), GET_Y_LPARAM(lparam)); window->machine().ui_input().push_mouse_double_click_event(window->m_target, GET_X_LPARAM(lparam), GET_Y_LPARAM(lparam));
} }
else else

7
src/osd/windows/window.h
View File

@ -15,6 +15,7 @@
#include <windowsx.h> #include <windowsx.h>
#include <mmsystem.h> #include <mmsystem.h>
#include <chrono>
#include <mutex> #include <mutex>
#include "video.h" #include "video.h"
#include "render.h" #include "render.h"
@ -114,9 +115,9 @@ public:
render_layer_config m_targetlayerconfig; render_layer_config m_targetlayerconfig;
// input info // input info
DWORD m_lastclicktime; std::chrono::system_clock::time_point m_lastclicktime;
int m_lastclickx; int m_lastclickx;
int m_lastclicky; int m_lastclicky;
// drawing data // drawing data
osd_renderer * m_renderer; osd_renderer * m_renderer;