diff options
author | 2019-08-04 15:49:31 -0400 | |
---|---|---|
committer | 2019-08-04 15:49:31 -0400 | |
commit | fe3caae2a44c5534353e513563aebcd2dd79e8c2 (patch) | |
tree | 4ab957977dfe2625a029296b4e3ee7512381d7c0 /src/osd/modules/input/input_dinput.cpp | |
parent | 16b1ed88f69c1b61b947584ccf113fedb298b721 (diff) |
Creating an -attach_window command line parameter on Windows to attach to an existing window (#5381)
* Creating an -attach_window command line parameter on Windows to attach
to an existing window
* Moved -attach_window option to Windows-specific code
* Created an osd_set_aggressive_input_focus() function and exposed to LUA
* Created a dummy implementation of osd_set_aggressive_input_focus() for
SDL
Diffstat (limited to 'src/osd/modules/input/input_dinput.cpp')
-rw-r--r-- | src/osd/modules/input/input_dinput.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/osd/modules/input/input_dinput.cpp b/src/osd/modules/input/input_dinput.cpp index 4d434ce3b4c..0b5eb348dc0 100644 --- a/src/osd/modules/input/input_dinput.cpp +++ b/src/osd/modules/input/input_dinput.cpp @@ -300,7 +300,7 @@ public: int keynum; // allocate and link in a new device - devinfo = m_dinput_helper->create_device<dinput_keyboard_device>(machine, *this, instance, &c_dfDIKeyboard, nullptr, DISCL_FOREGROUND | DISCL_NONEXCLUSIVE); + devinfo = m_dinput_helper->create_device<dinput_keyboard_device>(machine, *this, instance, &c_dfDIKeyboard, nullptr, dinput_cooperative_level::FOREGROUND); if (devinfo == nullptr) goto exit; @@ -372,7 +372,7 @@ public: HRESULT result; // allocate and link in a new device - devinfo = m_dinput_helper->create_device<dinput_mouse_device>(machine, *this, instance, &c_dfDIMouse2, &c_dfDIMouse, DISCL_FOREGROUND | DISCL_NONEXCLUSIVE); + devinfo = m_dinput_helper->create_device<dinput_mouse_device>(machine, *this, instance, &c_dfDIMouse2, &c_dfDIMouse, dinput_cooperative_level::FOREGROUND); if (devinfo == nullptr) goto exit; @@ -572,13 +572,13 @@ public: BOOL device_enum_callback(LPCDIDEVICEINSTANCE instance, LPVOID ref) override { - DWORD cooperative_level = DISCL_FOREGROUND | DISCL_NONEXCLUSIVE; + dinput_cooperative_level cooperative_level = dinput_cooperative_level::FOREGROUND; running_machine &machine = *static_cast<running_machine *>(ref); dinput_joystick_device *devinfo; int result = 0; if (!osd_common_t::s_window_list.empty() && osd_common_t::s_window_list.front()->win_has_menu()) - cooperative_level = DISCL_BACKGROUND | DISCL_NONEXCLUSIVE; + cooperative_level = dinput_cooperative_level::BACKGROUND; // allocate and link in a new device devinfo = m_dinput_helper->create_device<dinput_joystick_device>(machine, *this, instance, &c_dfDIJoystick, nullptr, cooperative_level); |