diff options
author | Miodrag Milanovic <mmicko@gmail.com> | 2021-10-26 11:45:04 +0200 |
---|---|---|
committer | Miodrag Milanovic <mmicko@gmail.com> | 2021-10-26 11:45:04 +0200 |
commit | 8aa5c5a29c5af282c8c89a489f91617f59a97706 (patch) | |
tree | ffc0989f406f5aa7083c74d3938c81a060ace12a /src/osd/modules/input | |
parent | 67389f4cbdd00e1b139590325d5fbae47d0e62d0 (diff) |
Remove OSD_UWP from rest of code
Diffstat (limited to 'src/osd/modules/input')
-rw-r--r-- | src/osd/modules/input/input_common.cpp | 27 | ||||
-rw-r--r-- | src/osd/modules/input/input_common.h | 6 | ||||
-rw-r--r-- | src/osd/modules/input/input_windows.cpp | 16 | ||||
-rw-r--r-- | src/osd/modules/input/input_xinput.cpp | 4 |
4 files changed, 4 insertions, 49 deletions
diff --git a/src/osd/modules/input/input_common.cpp b/src/osd/modules/input/input_common.cpp index 344d7f02f51..a04c46b6477 100644 --- a/src/osd/modules/input/input_common.cpp +++ b/src/osd/modules/input/input_common.cpp @@ -32,16 +32,13 @@ #include <SDL2/SDL.h> #define KEY_TRANS_ENTRY0(mame, sdlsc, sdlkey, disc, virtual, uwp, ascii, UI) { ITEM_ID_##mame, SDL_SCANCODE_ ## sdlsc, ascii, "ITEM_ID_"#mame, (char *) UI } #define KEY_TRANS_ENTRY1(mame, sdlsc, sdlkey, disc, virtual, uwp, ascii) { ITEM_ID_##mame, SDL_SCANCODE_ ## sdlsc, ascii, "ITEM_ID_"#mame, (char*) #mame } -#elif defined(OSD_UWP) -#define KEY_TRANS_ENTRY0(mame, sdlsc, sdlkey, disc, virtual, uwp, ascii, UI) { ITEM_ID_##mame, KEY_ ## disc, Windows::System::VirtualKey:: ## uwp, ascii, "ITEM_ID_"#mame, (char *) UI } -#define KEY_TRANS_ENTRY1(mame, sdlsc, sdlkey, disc, virtual, uwp, ascii) { ITEM_ID_##mame, KEY_ ## disc, Windows::System::VirtualKey:: ## uwp, ascii, "ITEM_ID_"#mame, (char*) #mame } #else // osd mini #endif // FIXME: sdl_key can be removed from the table below. It is no longer used. -#if defined(OSD_WINDOWS) || defined(OSD_SDL) || defined(OSD_UWP) +#if defined(OSD_WINDOWS) || defined(OSD_SDL) key_trans_entry keyboard_trans_table::s_default_table[] = { // MAME key sdl scancode sdl key di scancode virtual key uwp vkey ascii ui @@ -227,7 +224,7 @@ input_item_id keyboard_trans_table::lookup_mame_code(const char *scode) const } // Windows specific lookup methods -#if defined(OSD_WINDOWS) || defined(OSD_UWP) +#if defined(OSD_WINDOWS) input_item_id keyboard_trans_table::map_di_scancode_to_itemid(int scancode) const { @@ -242,10 +239,6 @@ input_item_id keyboard_trans_table::map_di_scancode_to_itemid(int scancode) cons return ITEM_ID_OTHER_SWITCH; } -#endif - -#if defined(OSD_WINDOWS) - //============================================================ // wininput_vkey_for_mame_code //============================================================ @@ -268,22 +261,6 @@ int keyboard_trans_table::vkey_for_mame_code(input_code code) const #endif -#if defined(OSD_UWP) - -const char* keyboard_trans_table::ui_label_for_mame_key(input_item_id itemid) const -{ - // scan the table for a match - for (int tablenum = 0; tablenum < m_table_size; tablenum++) - if (m_table[tablenum].mame_key == itemid) - return m_table[tablenum].ui_name; - - // We didn't find one - return nullptr; -} - -#endif - - int input_module_base::init(const osd_options &options) { m_options = &options; diff --git a/src/osd/modules/input/input_common.h b/src/osd/modules/input/input_common.h index bddcf9b6384..49c4e768dcf 100644 --- a/src/osd/modules/input/input_common.h +++ b/src/osd/modules/input/input_common.h @@ -360,9 +360,6 @@ struct key_trans_entry { #elif defined(OSD_WINDOWS) int scan_code; unsigned char virtual_key; -#elif defined(OSD_UWP) - int scan_code; - Windows::System::VirtualKey virtual_key; #endif char ascii_key; @@ -396,9 +393,6 @@ public: #if defined(OSD_WINDOWS) input_item_id map_di_scancode_to_itemid(int di_scancode) const; int vkey_for_mame_code(input_code code) const; -#elif defined(OSD_UWP) - input_item_id map_di_scancode_to_itemid(int di_scancode) const; - const char* ui_label_for_mame_key(input_item_id code) const; #endif static keyboard_trans_table& instance() diff --git a/src/osd/modules/input/input_windows.cpp b/src/osd/modules/input/input_windows.cpp index 9432aab83a7..b00d5570ca2 100644 --- a/src/osd/modules/input/input_windows.cpp +++ b/src/osd/modules/input/input_windows.cpp @@ -8,7 +8,7 @@ #include "input_module.h" -#if defined(OSD_WINDOWS) || defined(OSD_UWP) +#if defined(OSD_WINDOWS) // MAME headers #include "emu.h" @@ -81,23 +81,11 @@ void windows_osd_interface::customize_input_type_list(std::vector<input_type_ent for (input_type_entry &entry : typelist) switch (entry.type()) { -#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) // disable the config menu if the ALT key is down // (allows ALT-TAB to switch between windows apps) case IPT_UI_CONFIGURE: entry.defseq(SEQ_TYPE_STANDARD).set(KEYCODE_TAB, input_seq::not_code, KEYCODE_LALT, input_seq::not_code, KEYCODE_RALT); break; -#else - // UWP: Hotkey Select + X => UI_CONFIGURE (Menu) - case IPT_UI_CONFIGURE: - entry.defseq(SEQ_TYPE_STANDARD).set(KEYCODE_TAB, input_seq::or_code, JOYCODE_SELECT, JOYCODE_BUTTON3); - break; - - // UWP: Hotkey Select + Start => CANCEL - case IPT_UI_CANCEL: - entry.defseq(SEQ_TYPE_STANDARD).set(KEYCODE_ESC, input_seq::or_code, JOYCODE_SELECT, JOYCODE_START); - break; -#endif // configurable UI mode switch case IPT_UI_TOGGLE_UI: uimode = options().ui_mode_key(); @@ -163,4 +151,4 @@ void windows_osd_interface::customize_input_type_list(std::vector<input_type_ent } } -#endif // defined(OSD_WINDOWS) || defined(OSD_UWP) +#endif // defined(OSD_WINDOWS) diff --git a/src/osd/modules/input/input_xinput.cpp b/src/osd/modules/input/input_xinput.cpp index 4ae4cfba7ac..dd4c418aacd 100644 --- a/src/osd/modules/input/input_xinput.cpp +++ b/src/osd/modules/input/input_xinput.cpp @@ -30,11 +30,7 @@ #include "input_windows.h" #include "input_xinput.h" -#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) #define XINPUT_LIBRARIES { "xinput1_4.dll", "xinput9_1_0.dll" } -#else -#define XINPUT_LIBRARIES { "xinput1_4.dll" } -#endif #define XINPUT_AXIS_MINVALUE -32767 #define XINPUT_AXIS_MAXVALUE 32767 |