summaryrefslogtreecommitdiffstatshomepage
path: root/src/osd/windows/input.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/osd/windows/input.c')
-rw-r--r--src/osd/windows/input.c352
1 files changed, 176 insertions, 176 deletions
diff --git a/src/osd/windows/input.c b/src/osd/windows/input.c
index e22b669efc4..8e28447efaa 100644
--- a/src/osd/windows/input.c
+++ b/src/osd/windows/input.c
@@ -40,7 +40,7 @@
//============================================================
// For testing purposes: force DirectInput
-#define FORCE_DIRECTINPUT 0
+#define FORCE_DIRECTINPUT 0
// standard windows headers
#define WIN32_LEAN_AND_MEAN
@@ -84,12 +84,12 @@ enum
POVDIR_DOWN
};
-#define MAX_KEYS 256
+#define MAX_KEYS 256
-#define MAME_KEY 0
-#define DI_KEY 1
-#define VIRTUAL_KEY 2
-#define ASCII_KEY 3
+#define MAME_KEY 0
+#define DI_KEY 1
+#define VIRTUAL_KEY 2
+#define ASCII_KEY 3
@@ -97,12 +97,12 @@ enum
// MACROS
//============================================================
-#define STRUCTSIZE(x) ((dinput_version == 0x0300) ? sizeof(x##_DX3) : sizeof(x))
+#define STRUCTSIZE(x) ((dinput_version == 0x0300) ? sizeof(x##_DX3) : sizeof(x))
#ifdef UNICODE
-#define UNICODE_SUFFIX "W"
+#define UNICODE_SUFFIX "W"
#else
-#define UNICODE_SUFFIX "A"
+#define UNICODE_SUFFIX "A"
#endif
@@ -114,43 +114,43 @@ enum
// state information for a keyboard; DirectInput state must be first element
struct keyboard_state
{
- UINT8 state[MAX_KEYS];
- INT8 oldkey[MAX_KEYS];
- INT8 currkey[MAX_KEYS];
+ UINT8 state[MAX_KEYS];
+ INT8 oldkey[MAX_KEYS];
+ INT8 currkey[MAX_KEYS];
};
// state information for a mouse; DirectInput state must be first element
struct mouse_state
{
- DIMOUSESTATE2 state;
- LONG raw_x, raw_y, raw_z;
+ DIMOUSESTATE2 state;
+ LONG raw_x, raw_y, raw_z;
};
// state information for a joystick; DirectInput state must be first element
struct joystick_state
{
- DIJOYSTATE state;
- LONG rangemin[8];
- LONG rangemax[8];
+ DIJOYSTATE state;
+ LONG rangemin[8];
+ LONG rangemax[8];
};
// DirectInput-specific information about a device
struct dinput_device_info
{
- LPDIRECTINPUTDEVICE device;
- LPDIRECTINPUTDEVICE2 device2;
- DIDEVCAPS caps;
- LPCDIDATAFORMAT format;
+ LPDIRECTINPUTDEVICE device;
+ LPDIRECTINPUTDEVICE2 device2;
+ DIDEVCAPS caps;
+ LPCDIDATAFORMAT format;
};
// RawInput-specific information about a device
struct rawinput_device_info
{
- HANDLE device;
+ HANDLE device;
};
@@ -164,28 +164,28 @@ public:
running_machine &machine() const { return m_machine; }
// device information
- device_info ** head;
- device_info * next;
- const char * name;
- void (*poll)(device_info *info);
+ device_info ** head;
+ device_info * next;
+ const char * name;
+ void (*poll)(device_info *info);
// MAME information
- input_device * device;
+ input_device * device;
// device state
union
{
- keyboard_state keyboard;
- mouse_state mouse;
- joystick_state joystick;
+ keyboard_state keyboard;
+ mouse_state mouse;
+ joystick_state joystick;
};
// DirectInput/RawInput-specific state
- dinput_device_info dinput;
- rawinput_device_info rawinput;
+ dinput_device_info dinput;
+ rawinput_device_info rawinput;
private:
- running_machine & m_machine;
+ running_machine & m_machine;
};
@@ -202,36 +202,36 @@ typedef /*WINUSERAPI*/ BOOL (WINAPI *register_rawinput_devices_ptr)(IN PCRAWINPU
//============================================================
// global states
-static UINT8 input_enabled;
-static osd_lock * input_lock;
-static UINT8 input_paused;
-static DWORD last_poll;
+static UINT8 input_enabled;
+static osd_lock * input_lock;
+static UINT8 input_paused;
+static DWORD last_poll;
// DirectInput variables
-static LPDIRECTINPUT dinput;
-static int dinput_version;
+static LPDIRECTINPUT dinput;
+static int dinput_version;
// RawInput variables
-static get_rawinput_device_list_ptr get_rawinput_device_list;
-static get_rawinput_data_ptr get_rawinput_data;
-static get_rawinput_device_info_ptr get_rawinput_device_info;
-static register_rawinput_devices_ptr register_rawinput_devices;
+static get_rawinput_device_list_ptr get_rawinput_device_list;
+static get_rawinput_data_ptr get_rawinput_data;
+static get_rawinput_device_info_ptr get_rawinput_device_info;
+static register_rawinput_devices_ptr register_rawinput_devices;
// keyboard states
-static UINT8 keyboard_win32_reported_key_down;
-static device_info * keyboard_list;
+static UINT8 keyboard_win32_reported_key_down;
+static device_info * keyboard_list;
// mouse states
-static UINT8 mouse_enabled;
-static device_info * mouse_list;
+static UINT8 mouse_enabled;
+static device_info * mouse_list;
// lightgun states
-static UINT8 lightgun_shared_axis_mode;
-static UINT8 lightgun_enabled;
-static device_info * lightgun_list;
+static UINT8 lightgun_shared_axis_mode;
+static UINT8 lightgun_enabled;
+static device_info * lightgun_list;
// joystick states
-static device_info * joystick_list;
+static device_info * joystick_list;
// default axis names
static const TCHAR *const default_axis_name[] =
@@ -311,115 +311,115 @@ static const TCHAR *default_pov_name(int which);
static const int win_key_trans_table[][4] =
{
// MAME key dinput key virtual key ascii
- { ITEM_ID_ESC, DIK_ESCAPE, VK_ESCAPE, 27 },
- { ITEM_ID_1, DIK_1, '1', '1' },
- { ITEM_ID_2, DIK_2, '2', '2' },
- { ITEM_ID_3, DIK_3, '3', '3' },
- { ITEM_ID_4, DIK_4, '4', '4' },
- { ITEM_ID_5, DIK_5, '5', '5' },
- { ITEM_ID_6, DIK_6, '6', '6' },
- { ITEM_ID_7, DIK_7, '7', '7' },
- { ITEM_ID_8, DIK_8, '8', '8' },
- { ITEM_ID_9, DIK_9, '9', '9' },
- { ITEM_ID_0, DIK_0, '0', '0' },
- { ITEM_ID_MINUS, DIK_MINUS, VK_OEM_MINUS, '-' },
- { ITEM_ID_EQUALS, DIK_EQUALS, VK_OEM_PLUS, '=' },
- { ITEM_ID_BACKSPACE, DIK_BACK, VK_BACK, 8 },
- { ITEM_ID_TAB, DIK_TAB, VK_TAB, 9 },
- { ITEM_ID_Q, DIK_Q, 'Q', 'Q' },
- { ITEM_ID_W, DIK_W, 'W', 'W' },
- { ITEM_ID_E, DIK_E, 'E', 'E' },
- { ITEM_ID_R, DIK_R, 'R', 'R' },
- { ITEM_ID_T, DIK_T, 'T', 'T' },
- { ITEM_ID_Y, DIK_Y, 'Y', 'Y' },
- { ITEM_ID_U, DIK_U, 'U', 'U' },
- { ITEM_ID_I, DIK_I, 'I', 'I' },
- { ITEM_ID_O, DIK_O, 'O', 'O' },
- { ITEM_ID_P, DIK_P, 'P', 'P' },
- { ITEM_ID_OPENBRACE, DIK_LBRACKET, VK_OEM_4, '[' },
- { ITEM_ID_CLOSEBRACE, DIK_RBRACKET, VK_OEM_6, ']' },
- { ITEM_ID_ENTER, DIK_RETURN, VK_RETURN, 13 },
- { ITEM_ID_LCONTROL, DIK_LCONTROL, VK_LCONTROL, 0 },
- { ITEM_ID_A, DIK_A, 'A', 'A' },
- { ITEM_ID_S, DIK_S, 'S', 'S' },
- { ITEM_ID_D, DIK_D, 'D', 'D' },
- { ITEM_ID_F, DIK_F, 'F', 'F' },
- { ITEM_ID_G, DIK_G, 'G', 'G' },
- { ITEM_ID_H, DIK_H, 'H', 'H' },
- { ITEM_ID_J, DIK_J, 'J', 'J' },
- { ITEM_ID_K, DIK_K, 'K', 'K' },
- { ITEM_ID_L, DIK_L, 'L', 'L' },
- { ITEM_ID_COLON, DIK_SEMICOLON, VK_OEM_1, ';' },
- { ITEM_ID_QUOTE, DIK_APOSTROPHE, VK_OEM_7, '\'' },
- { ITEM_ID_TILDE, DIK_GRAVE, VK_OEM_3, '`' },
- { ITEM_ID_LSHIFT, DIK_LSHIFT, VK_LSHIFT, 0 },
- { ITEM_ID_BACKSLASH, DIK_BACKSLASH, VK_OEM_5, '\\' },
- { ITEM_ID_BACKSLASH2, DIK_OEM_102, VK_OEM_102, '<' },
- { ITEM_ID_Z, DIK_Z, 'Z', 'Z' },
- { ITEM_ID_X, DIK_X, 'X', 'X' },
- { ITEM_ID_C, DIK_C, 'C', 'C' },
- { ITEM_ID_V, DIK_V, 'V', 'V' },
- { ITEM_ID_B, DIK_B, 'B', 'B' },
- { ITEM_ID_N, DIK_N, 'N', 'N' },
- { ITEM_ID_M, DIK_M, 'M', 'M' },
- { ITEM_ID_COMMA, DIK_COMMA, VK_OEM_COMMA, ',' },
- { ITEM_ID_STOP, DIK_PERIOD, VK_OEM_PERIOD, '.' },
- { ITEM_ID_SLASH, DIK_SLASH, VK_OEM_2, '/' },
- { ITEM_ID_RSHIFT, DIK_RSHIFT, VK_RSHIFT, 0 },
- { ITEM_ID_ASTERISK, DIK_MULTIPLY, VK_MULTIPLY, '*' },
- { ITEM_ID_LALT, DIK_LMENU, VK_LMENU, 0 },
- { ITEM_ID_SPACE, DIK_SPACE, VK_SPACE, ' ' },
- { ITEM_ID_CAPSLOCK, DIK_CAPITAL, VK_CAPITAL, 0 },
- { ITEM_ID_F1, DIK_F1, VK_F1, 0 },
- { ITEM_ID_F2, DIK_F2, VK_F2, 0 },
- { ITEM_ID_F3, DIK_F3, VK_F3, 0 },
- { ITEM_ID_F4, DIK_F4, VK_F4, 0 },
- { ITEM_ID_F5, DIK_F5, VK_F5, 0 },
- { ITEM_ID_F6, DIK_F6, VK_F6, 0 },
- { ITEM_ID_F7, DIK_F7, VK_F7, 0 },
- { ITEM_ID_F8, DIK_F8, VK_F8, 0 },
- { ITEM_ID_F9, DIK_F9, VK_F9, 0 },
- { ITEM_ID_F10, DIK_F10, VK_F10, 0 },
- { ITEM_ID_NUMLOCK, DIK_NUMLOCK, VK_NUMLOCK, 0 },
- { ITEM_ID_SCRLOCK, DIK_SCROLL, VK_SCROLL, 0 },
- { ITEM_ID_7_PAD, DIK_NUMPAD7, VK_NUMPAD7, 0 },
- { ITEM_ID_8_PAD, DIK_NUMPAD8, VK_NUMPAD8, 0 },
- { ITEM_ID_9_PAD, DIK_NUMPAD9, VK_NUMPAD9, 0 },
- { ITEM_ID_MINUS_PAD, DIK_SUBTRACT, VK_SUBTRACT, 0 },
- { ITEM_ID_4_PAD, DIK_NUMPAD4, VK_NUMPAD4, 0 },
- { ITEM_ID_5_PAD, DIK_NUMPAD5, VK_NUMPAD5, 0 },
- { ITEM_ID_6_PAD, DIK_NUMPAD6, VK_NUMPAD6, 0 },
- { ITEM_ID_PLUS_PAD, DIK_ADD, VK_ADD, 0 },
- { ITEM_ID_1_PAD, DIK_NUMPAD1, VK_NUMPAD1, 0 },
- { ITEM_ID_2_PAD, DIK_NUMPAD2, VK_NUMPAD2, 0 },
- { ITEM_ID_3_PAD, DIK_NUMPAD3, VK_NUMPAD3, 0 },
- { ITEM_ID_0_PAD, DIK_NUMPAD0, VK_NUMPAD0, 0 },
- { ITEM_ID_DEL_PAD, DIK_DECIMAL, VK_DECIMAL, 0 },
- { ITEM_ID_F11, DIK_F11, VK_F11, 0 },
- { ITEM_ID_F12, DIK_F12, VK_F12, 0 },
- { ITEM_ID_F13, DIK_F13, VK_F13, 0 },
- { ITEM_ID_F14, DIK_F14, VK_F14, 0 },
- { ITEM_ID_F15, DIK_F15, VK_F15, 0 },
- { ITEM_ID_ENTER_PAD, DIK_NUMPADENTER, VK_RETURN, 0 },
- { ITEM_ID_RCONTROL, DIK_RCONTROL, VK_RCONTROL, 0 },
- { ITEM_ID_SLASH_PAD, DIK_DIVIDE, VK_DIVIDE, 0 },
- { ITEM_ID_PRTSCR, DIK_SYSRQ, 0, 0 },
- { ITEM_ID_RALT, DIK_RMENU, VK_RMENU, 0 },
- { ITEM_ID_HOME, DIK_HOME, VK_HOME, 0 },
- { ITEM_ID_UP, DIK_UP, VK_UP, 0 },
- { ITEM_ID_PGUP, DIK_PRIOR, VK_PRIOR, 0 },
- { ITEM_ID_LEFT, DIK_LEFT, VK_LEFT, 0 },
- { ITEM_ID_RIGHT, DIK_RIGHT, VK_RIGHT, 0 },
- { ITEM_ID_END, DIK_END, VK_END, 0 },
- { ITEM_ID_DOWN, DIK_DOWN, VK_DOWN, 0 },
- { ITEM_ID_PGDN, DIK_NEXT, VK_NEXT, 0 },
- { ITEM_ID_INSERT, DIK_INSERT, VK_INSERT, 0 },
- { ITEM_ID_DEL, DIK_DELETE, VK_DELETE, 0 },
- { ITEM_ID_LWIN, DIK_LWIN, VK_LWIN, 0 },
- { ITEM_ID_RWIN, DIK_RWIN, VK_RWIN, 0 },
- { ITEM_ID_MENU, DIK_APPS, VK_APPS, 0 },
- { ITEM_ID_PAUSE, DIK_PAUSE, VK_PAUSE, 0 },
- { ITEM_ID_CANCEL, 0, VK_CANCEL, 0 },
+ { ITEM_ID_ESC, DIK_ESCAPE, VK_ESCAPE, 27 },
+ { ITEM_ID_1, DIK_1, '1', '1' },
+ { ITEM_ID_2, DIK_2, '2', '2' },
+ { ITEM_ID_3, DIK_3, '3', '3' },
+ { ITEM_ID_4, DIK_4, '4', '4' },
+ { ITEM_ID_5, DIK_5, '5', '5' },
+ { ITEM_ID_6, DIK_6, '6', '6' },
+ { ITEM_ID_7, DIK_7, '7', '7' },
+ { ITEM_ID_8, DIK_8, '8', '8' },
+ { ITEM_ID_9, DIK_9, '9', '9' },
+ { ITEM_ID_0, DIK_0, '0', '0' },
+ { ITEM_ID_MINUS, DIK_MINUS, VK_OEM_MINUS, '-' },
+ { ITEM_ID_EQUALS, DIK_EQUALS, VK_OEM_PLUS, '=' },
+ { ITEM_ID_BACKSPACE, DIK_BACK, VK_BACK, 8 },
+ { ITEM_ID_TAB, DIK_TAB, VK_TAB, 9 },
+ { ITEM_ID_Q, DIK_Q, 'Q', 'Q' },
+ { ITEM_ID_W, DIK_W, 'W', 'W' },
+ { ITEM_ID_E, DIK_E, 'E', 'E' },
+ { ITEM_ID_R, DIK_R, 'R', 'R' },
+ { ITEM_ID_T, DIK_T, 'T', 'T' },
+ { ITEM_ID_Y, DIK_Y, 'Y', 'Y' },
+ { ITEM_ID_U, DIK_U, 'U', 'U' },
+ { ITEM_ID_I, DIK_I, 'I', 'I' },
+ { ITEM_ID_O, DIK_O, 'O', 'O' },
+ { ITEM_ID_P, DIK_P, 'P', 'P' },
+ { ITEM_ID_OPENBRACE, DIK_LBRACKET, VK_OEM_4, '[' },
+ { ITEM_ID_CLOSEBRACE, DIK_RBRACKET, VK_OEM_6, ']' },
+ { ITEM_ID_ENTER, DIK_RETURN, VK_RETURN, 13 },
+ { ITEM_ID_LCONTROL, DIK_LCONTROL, VK_LCONTROL, 0 },
+ { ITEM_ID_A, DIK_A, 'A', 'A' },
+ { ITEM_ID_S, DIK_S, 'S', 'S' },
+ { ITEM_ID_D, DIK_D, 'D', 'D' },
+ { ITEM_ID_F, DIK_F, 'F', 'F' },
+ { ITEM_ID_G, DIK_G, 'G', 'G' },
+ { ITEM_ID_H, DIK_H, 'H', 'H' },
+ { ITEM_ID_J, DIK_J, 'J', 'J' },
+ { ITEM_ID_K, DIK_K, 'K', 'K' },
+ { ITEM_ID_L, DIK_L, 'L', 'L' },
+ { ITEM_ID_COLON, DIK_SEMICOLON, VK_OEM_1, ';' },
+ { ITEM_ID_QUOTE, DIK_APOSTROPHE, VK_OEM_7, '\'' },
+ { ITEM_ID_TILDE, DIK_GRAVE, VK_OEM_3, '`' },
+ { ITEM_ID_LSHIFT, DIK_LSHIFT, VK_LSHIFT, 0 },
+ { ITEM_ID_BACKSLASH, DIK_BACKSLASH, VK_OEM_5, '\\' },
+ { ITEM_ID_BACKSLASH2, DIK_OEM_102, VK_OEM_102, '<' },
+ { ITEM_ID_Z, DIK_Z, 'Z', 'Z' },
+ { ITEM_ID_X, DIK_X, 'X', 'X' },
+ { ITEM_ID_C, DIK_C, 'C', 'C' },
+ { ITEM_ID_V, DIK_V, 'V', 'V' },
+ { ITEM_ID_B, DIK_B, 'B', 'B' },
+ { ITEM_ID_N, DIK_N, 'N', 'N' },
+ { ITEM_ID_M, DIK_M, 'M', 'M' },
+ { ITEM_ID_COMMA, DIK_COMMA, VK_OEM_COMMA, ',' },
+ { ITEM_ID_STOP, DIK_PERIOD, VK_OEM_PERIOD, '.' },
+ { ITEM_ID_SLASH, DIK_SLASH, VK_OEM_2, '/' },
+ { ITEM_ID_RSHIFT, DIK_RSHIFT, VK_RSHIFT, 0 },
+ { ITEM_ID_ASTERISK, DIK_MULTIPLY, VK_MULTIPLY, '*' },
+ { ITEM_ID_LALT, DIK_LMENU, VK_LMENU, 0 },
+ { ITEM_ID_SPACE, DIK_SPACE, VK_SPACE, ' ' },
+ { ITEM_ID_CAPSLOCK, DIK_CAPITAL, VK_CAPITAL, 0 },
+ { ITEM_ID_F1, DIK_F1, VK_F1, 0 },
+ { ITEM_ID_F2, DIK_F2, VK_F2, 0 },
+ { ITEM_ID_F3, DIK_F3, VK_F3, 0 },
+ { ITEM_ID_F4, DIK_F4, VK_F4, 0 },
+ { ITEM_ID_F5, DIK_F5, VK_F5, 0 },
+ { ITEM_ID_F6, DIK_F6, VK_F6, 0 },
+ { ITEM_ID_F7, DIK_F7, VK_F7, 0 },
+ { ITEM_ID_F8, DIK_F8, VK_F8, 0 },
+ { ITEM_ID_F9, DIK_F9, VK_F9, 0 },
+ { ITEM_ID_F10, DIK_F10, VK_F10, 0 },
+ { ITEM_ID_NUMLOCK, DIK_NUMLOCK, VK_NUMLOCK, 0 },
+ { ITEM_ID_SCRLOCK, DIK_SCROLL, VK_SCROLL, 0 },
+ { ITEM_ID_7_PAD, DIK_NUMPAD7, VK_NUMPAD7, 0 },
+ { ITEM_ID_8_PAD, DIK_NUMPAD8, VK_NUMPAD8, 0 },
+ { ITEM_ID_9_PAD, DIK_NUMPAD9, VK_NUMPAD9, 0 },
+ { ITEM_ID_MINUS_PAD, DIK_SUBTRACT, VK_SUBTRACT, 0 },
+ { ITEM_ID_4_PAD, DIK_NUMPAD4, VK_NUMPAD4, 0 },
+ { ITEM_ID_5_PAD, DIK_NUMPAD5, VK_NUMPAD5, 0 },
+ { ITEM_ID_6_PAD, DIK_NUMPAD6, VK_NUMPAD6, 0 },
+ { ITEM_ID_PLUS_PAD, DIK_ADD, VK_ADD, 0 },
+ { ITEM_ID_1_PAD, DIK_NUMPAD1, VK_NUMPAD1, 0 },
+ { ITEM_ID_2_PAD, DIK_NUMPAD2, VK_NUMPAD2, 0 },
+ { ITEM_ID_3_PAD, DIK_NUMPAD3, VK_NUMPAD3, 0 },
+ { ITEM_ID_0_PAD, DIK_NUMPAD0, VK_NUMPAD0, 0 },
+ { ITEM_ID_DEL_PAD, DIK_DECIMAL, VK_DECIMAL, 0 },
+ { ITEM_ID_F11, DIK_F11, VK_F11, 0 },
+ { ITEM_ID_F12, DIK_F12, VK_F12, 0 },
+ { ITEM_ID_F13, DIK_F13, VK_F13, 0 },
+ { ITEM_ID_F14, DIK_F14, VK_F14, 0 },
+ { ITEM_ID_F15, DIK_F15, VK_F15, 0 },
+ { ITEM_ID_ENTER_PAD, DIK_NUMPADENTER, VK_RETURN, 0 },
+ { ITEM_ID_RCONTROL, DIK_RCONTROL, VK_RCONTROL, 0 },
+ { ITEM_ID_SLASH_PAD, DIK_DIVIDE, VK_DIVIDE, 0 },
+ { ITEM_ID_PRTSCR, DIK_SYSRQ, 0, 0 },
+ { ITEM_ID_RALT, DIK_RMENU, VK_RMENU, 0 },
+ { ITEM_ID_HOME, DIK_HOME, VK_HOME, 0 },
+ { ITEM_ID_UP, DIK_UP, VK_UP, 0 },
+ { ITEM_ID_PGUP, DIK_PRIOR, VK_PRIOR, 0 },
+ { ITEM_ID_LEFT, DIK_LEFT, VK_LEFT, 0 },
+ { ITEM_ID_RIGHT, DIK_RIGHT, VK_RIGHT, 0 },
+ { ITEM_ID_END, DIK_END, VK_END, 0 },
+ { ITEM_ID_DOWN, DIK_DOWN, VK_DOWN, 0 },
+ { ITEM_ID_PGDN, DIK_NEXT, VK_NEXT, 0 },
+ { ITEM_ID_INSERT, DIK_INSERT, VK_INSERT, 0 },
+ { ITEM_ID_DEL, DIK_DELETE, VK_DELETE, 0 },
+ { ITEM_ID_LWIN, DIK_LWIN, VK_LWIN, 0 },
+ { ITEM_ID_RWIN, DIK_RWIN, VK_RWIN, 0 },
+ { ITEM_ID_MENU, DIK_APPS, VK_APPS, 0 },
+ { ITEM_ID_PAUSE, DIK_PAUSE, VK_PAUSE, 0 },
+ { ITEM_ID_CANCEL, 0, VK_CANCEL, 0 },
// New keys introduced in Windows 2000. These have no MAME codes to
// preserve compatibility with old config files that may refer to them
@@ -429,18 +429,18 @@ static const int win_key_trans_table[][4] =
// paused). Some codes are missing because the mapping to vkey codes
// isn't clear, and MapVirtualKey is no help.
- { ITEM_ID_OTHER_SWITCH, DIK_MUTE, VK_VOLUME_MUTE, 0 },
- { ITEM_ID_OTHER_SWITCH, DIK_VOLUMEDOWN, VK_VOLUME_DOWN, 0 },
- { ITEM_ID_OTHER_SWITCH, DIK_VOLUMEUP, VK_VOLUME_UP, 0 },
- { ITEM_ID_OTHER_SWITCH, DIK_WEBHOME, VK_BROWSER_HOME, 0 },
- { ITEM_ID_OTHER_SWITCH, DIK_WEBSEARCH, VK_BROWSER_SEARCH, 0 },
- { ITEM_ID_OTHER_SWITCH, DIK_WEBFAVORITES, VK_BROWSER_FAVORITES, 0 },
- { ITEM_ID_OTHER_SWITCH, DIK_WEBREFRESH, VK_BROWSER_REFRESH, 0 },
- { ITEM_ID_OTHER_SWITCH, DIK_WEBSTOP, VK_BROWSER_STOP, 0 },
- { ITEM_ID_OTHER_SWITCH, DIK_WEBFORWARD, VK_BROWSER_FORWARD, 0 },
- { ITEM_ID_OTHER_SWITCH, DIK_WEBBACK, VK_BROWSER_BACK, 0 },
- { ITEM_ID_OTHER_SWITCH, DIK_MAIL, VK_LAUNCH_MAIL, 0 },
- { ITEM_ID_OTHER_SWITCH, DIK_MEDIASELECT, VK_LAUNCH_MEDIA_SELECT, 0 },
+ { ITEM_ID_OTHER_SWITCH, DIK_MUTE, VK_VOLUME_MUTE, 0 },
+ { ITEM_ID_OTHER_SWITCH, DIK_VOLUMEDOWN, VK_VOLUME_DOWN, 0 },
+ { ITEM_ID_OTHER_SWITCH, DIK_VOLUMEUP, VK_VOLUME_UP, 0 },
+ { ITEM_ID_OTHER_SWITCH, DIK_WEBHOME, VK_BROWSER_HOME, 0 },
+ { ITEM_ID_OTHER_SWITCH, DIK_WEBSEARCH, VK_BROWSER_SEARCH, 0 },
+ { ITEM_ID_OTHER_SWITCH, DIK_WEBFAVORITES, VK_BROWSER_FAVORITES, 0 },
+ { ITEM_ID_OTHER_SWITCH, DIK_WEBREFRESH, VK_BROWSER_REFRESH, 0 },
+ { ITEM_ID_OTHER_SWITCH, DIK_WEBSTOP, VK_BROWSER_STOP, 0 },
+ { ITEM_ID_OTHER_SWITCH, DIK_WEBFORWARD, VK_BROWSER_FORWARD, 0 },
+ { ITEM_ID_OTHER_SWITCH, DIK_WEBBACK, VK_BROWSER_BACK, 0 },
+ { ITEM_ID_OTHER_SWITCH, DIK_MAIL, VK_LAUNCH_MAIL, 0 },
+ { ITEM_ID_OTHER_SWITCH, DIK_MEDIASELECT, VK_LAUNCH_MEDIA_SELECT, 0 },
};
@@ -1649,10 +1649,10 @@ static INT32 dinput_joystick_pov_get_state(void *device_internal, void *item_int
// return the current state
switch (povdir)
{
- case POVDIR_LEFT: result = (pov >= 22500 && pov <= 31500); break;
- case POVDIR_RIGHT: result = (pov >= 4500 && pov <= 13500); break;
- case POVDIR_UP: result = (pov >= 31500 || pov <= 4500); break;
- case POVDIR_DOWN: result = (pov >= 13500 && pov <= 22500); break;
+ case POVDIR_LEFT: result = (pov >= 22500 && pov <= 31500); break;
+ case POVDIR_RIGHT: result = (pov >= 4500 && pov <= 13500); break;
+ case POVDIR_UP: result = (pov >= 31500 || pov <= 4500); break;
+ case POVDIR_DOWN: result = (pov >= 13500 && pov <= 22500); break;
}
return result;
}