From f9a7a84a72ef61e92226508e650a0c86353aa708 Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Sun, 27 Sep 2009 04:49:30 +0000 Subject: [PATCH] Added missing DirectX data --HG-- branch : SDL-1.2 extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/branches/SDL-1.2%403919 --- src/video/windx5/SDL_dx5video.c | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/src/video/windx5/SDL_dx5video.c b/src/video/windx5/SDL_dx5video.c index 5f1b5908d..a37f1a8c7 100644 --- a/src/video/windx5/SDL_dx5video.c +++ b/src/video/windx5/SDL_dx5video.c @@ -341,14 +341,30 @@ static DIOBJECTDATAFORMAT PTR_fmt[] = { { &GUID_XAxis, 0, 0x00FFFF03, 0x00000000 }, { &GUID_YAxis, 4, 0x00FFFF03, 0x00000000 }, { &GUID_ZAxis, 8, 0x80FFFF03, 0x00000000 }, - { NULL, 12, 0x00FFFF0C, 0x00000000 }, - { NULL, 13, 0x00FFFF0C, 0x00000000 }, - { NULL, 14, 0x80FFFF0C, 0x00000000 }, - { NULL, 15, 0x80FFFF0C, 0x00000000 }, + { NULL, 12, 0x00FFFF0C, 0x00000000 }, + { NULL, 13, 0x00FFFF0C, 0x00000000 }, + { NULL, 14, 0x80FFFF0C, 0x00000000 }, + { NULL, 15, 0x80FFFF0C, 0x00000000 }, }; const DIDATAFORMAT c_dfDIMouse = { sizeof(DIDATAFORMAT), sizeof(DIOBJECTDATAFORMAT), 0x00000002, 16, 7, PTR_fmt }; +static DIOBJECTDATAFORMAT PTR2_fmt[] = { + { &GUID_XAxis, 0, 0x00FFFF03, 0x00000000 }, + { &GUID_YAxis, 4, 0x00FFFF03, 0x00000000 }, + { &GUID_ZAxis, 8, 0x80FFFF03, 0x00000000 }, + { NULL, 12, 0x00FFFF0C, 0x00000000 }, + { NULL, 13, 0x00FFFF0C, 0x00000000 }, + { NULL, 14, 0x80FFFF0C, 0x00000000 }, + { NULL, 15, 0x80FFFF0C, 0x00000000 }, + { NULL, 16, 0x80FFFF0C, 0x00000000 }, + { NULL, 17, 0x80FFFF0C, 0x00000000 }, + { NULL, 18, 0x80FFFF0C, 0x00000000 }, + { NULL, 19, 0x80FFFF0C, 0x00000000 } +}; + +const DIDATAFORMAT c_dfDIMouse2 = { sizeof(DIDATAFORMAT), sizeof(DIOBJECTDATAFORMAT), 0x00000002, 20, 11, PTR2_fmt }; + /* Joystick */