diff options
| author | 2015-09-30 08:29:01 +0200 | |
|---|---|---|
| committer | 2015-09-30 08:29:01 +0200 | |
| commit | 8e4ced4b531ac52fb764d9374a7c215bc62a890a (patch) | |
| tree | c29767f6a9f305bac993eaaf1ca268e85cf0427c /src/osd/windows | |
| parent | 9fd990dea821ddca94916fa3eed0aef824eb08ea (diff) | |
Cleanups and version bumpmame0166
Diffstat (limited to 'src/osd/windows')
| -rw-r--r-- | src/osd/windows/input.c | 14 | ||||
| -rw-r--r-- | src/osd/windows/output.c | 2 | ||||
| -rw-r--r-- | src/osd/windows/window.c | 2 | ||||
| -rw-r--r-- | src/osd/windows/winmain.c | 2 | ||||
| -rw-r--r-- | src/osd/windows/winmain.h | 2 |
5 files changed, 11 insertions, 11 deletions
diff --git a/src/osd/windows/input.c b/src/osd/windows/input.c index 54c48835610..6afca302c27 100644 --- a/src/osd/windows/input.c +++ b/src/osd/windows/input.c @@ -544,9 +544,9 @@ void wininput_poll(running_machine &machine) mouse_enabled = machine.input().device_class(DEVICE_CLASS_MOUSE).enabled(); lightgun_enabled = machine.input().device_class(DEVICE_CLASS_LIGHTGUN).enabled(); } - + bool polldevices = input_enabled && (global_inputs_enabled || winwindow_has_focus()); - + // poll all of the devices if (polldevices) { @@ -1750,14 +1750,14 @@ static void rawinput_init(running_machine &machine) { global_inputs_enabled = downcast<windows_options &>(machine.options()).global_inputs(); } - + // finally, register to receive raw input WM_INPUT messages regcount = 0; if (keyboard_list != NULL) { reglist[regcount].usUsagePage = 0x01; reglist[regcount].usUsage = 0x06; - + if (global_inputs_enabled) { reglist[regcount].dwFlags = 0x00000100; @@ -1766,7 +1766,7 @@ static void rawinput_init(running_machine &machine) { reglist[regcount].dwFlags = 0; } - + reglist[regcount].hwndTarget = win_window_list->m_hwnd; regcount++; } @@ -1774,7 +1774,7 @@ static void rawinput_init(running_machine &machine) { reglist[regcount].usUsagePage = 0x01; reglist[regcount].usUsage = 0x02; - + if (global_inputs_enabled) { reglist[regcount].dwFlags = 0x00000100; @@ -1783,7 +1783,7 @@ static void rawinput_init(running_machine &machine) { reglist[regcount].dwFlags = 0; } - + reglist[regcount].hwndTarget = win_window_list->m_hwnd; regcount++; } diff --git a/src/osd/windows/output.c b/src/osd/windows/output.c index 7c7dbe35484..f21818efab8 100644 --- a/src/osd/windows/output.c +++ b/src/osd/windows/output.c @@ -171,7 +171,7 @@ static int create_window_class(void) wc.lpszClassName = OUTPUT_WINDOW_CLASS; wc.hInstance = GetModuleHandleUni(); wc.lpfnWndProc = output_window_proc; - + UnregisterClass(wc.lpszClassName, wc.hInstance); // register the class; fail if we can't diff --git a/src/osd/windows/window.c b/src/osd/windows/window.c index 94a0a69ea94..3c25e8e9ca5 100644 --- a/src/osd/windows/window.c +++ b/src/osd/windows/window.c @@ -891,7 +891,7 @@ static void create_window_class(void) wc.lpfnWndProc = winwindow_video_window_proc_ui; wc.hCursor = LoadCursor(NULL, IDC_ARROW); wc.hIcon = LoadIcon(wc.hInstance, MAKEINTRESOURCE(2)); - + UnregisterClass(wc.lpszClassName, wc.hInstance); // register the class; fail if we can't diff --git a/src/osd/windows/winmain.c b/src/osd/windows/winmain.c index 406cb18c3ec..82e48413f05 100644 --- a/src/osd/windows/winmain.c +++ b/src/osd/windows/winmain.c @@ -373,7 +373,7 @@ const options_entry windows_options::s_option_entries[] = // input options { NULL, NULL, OPTION_HEADER, "INPUT DEVICE OPTIONS" }, - { WINOPTION_GLOBAL_INPUTS ";global_inputs", "0", OPTION_BOOLEAN, "enable global inputs" }, + { WINOPTION_GLOBAL_INPUTS ";global_inputs", "0", OPTION_BOOLEAN, "enable global inputs" }, { WINOPTION_DUAL_LIGHTGUN ";dual", "0", OPTION_BOOLEAN, "enable dual lightgun input" }, { NULL } diff --git a/src/osd/windows/winmain.h b/src/osd/windows/winmain.h index 1959c1bf8af..5d6385cee58 100644 --- a/src/osd/windows/winmain.h +++ b/src/osd/windows/winmain.h @@ -105,7 +105,7 @@ #define WINOPTION_FULLSCREENGAMMA "full_screen_gamma" // input options -#define WINOPTION_GLOBAL_INPUTS "global_inputs" +#define WINOPTION_GLOBAL_INPUTS "global_inputs" #define WINOPTION_DUAL_LIGHTGUN "dual_lightgun" |
