From 852c35f705646aba9a268ad619c3db17bae4d864 Mon Sep 17 00:00:00 2001 From: Shawn Hoffman Date: Wed, 21 Jan 2009 05:46:07 +0000 Subject: [PATCH] update to sfml 1.4. also testsuite doesn't need debug and release configs, that was an accident git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1969 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Core/InputCommon/Src/Event.hpp | 573 ++++++++++++-------------- Source/TestSuite/TestSuite.sln | 17 - 2 files changed, 264 insertions(+), 326 deletions(-) diff --git a/Source/Core/InputCommon/Src/Event.hpp b/Source/Core/InputCommon/Src/Event.hpp index b7fd5c15aa..f9a028c57e 100755 --- a/Source/Core/InputCommon/Src/Event.hpp +++ b/Source/Core/InputCommon/Src/Event.hpp @@ -1,309 +1,264 @@ -//////////////////////////////////////////////////////////// -// -// SFML - Simple and Fast Multimedia Library -// Copyright (C) 2007-2008 Laurent Gomila (laurent.gom@gmail.com) -// -// This software is provided 'as-is', without any express or implied warranty. -// In no event will the authors be held liable for any damages arising from the use of this software. -// -// Permission is granted to anyone to use this software for any purpose, -// including commercial applications, and to alter it and redistribute it freely, -// subject to the following restrictions: -// -// 1. The origin of this software must not be misrepresented; -// you must not claim that you wrote the original software. -// If you use this software in a product, an acknowledgment -// in the product documentation would be appreciated but is not required. -// -// 2. Altered source versions must be plainly marked as such, -// and must not be misrepresented as being the original software. -// -// 3. This notice may not be removed or altered from any source distribution. -// -//////////////////////////////////////////////////////////// - -#ifndef SFML_EVENT_HPP -#define SFML_EVENT_HPP - -//////////////////////////////////////////////////////////// -// Headers -//////////////////////////////////////////////////////////// -//#include - - -namespace sf -{ -//////////////////////////////////////////////////////////// -/// Definition of key codes for keyboard events -//////////////////////////////////////////////////////////// -namespace Key -{ - enum Code - { - A = 'a', - B = 'b', - C = 'c', - D = 'd', - E = 'e', - F = 'f', - G = 'g', - H = 'h', - I = 'i', - J = 'j', - K = 'k', - L = 'l', - M = 'm', - N = 'n', - O = 'o', - P = 'p', - Q = 'q', - R = 'r', - S = 's', - T = 't', - U = 'u', - V = 'v', - W = 'w', - X = 'x', - Y = 'y', - Z = 'z', - Num0 = '0', - Num1 = '1', - Num2 = '2', - Num3 = '3', - Num4 = '4', - Num5 = '5', - Num6 = '6', - Num7 = '7', - Num8 = '8', - Num9 = '9', - Escape = 256, - LControl, - LShift, - LAlt, - LSystem, ///< OS specific key (left side) : windows (Win and Linux), apple (MacOS), ... - RControl, - RShift, - RAlt, - RSystem, ///< OS specific key (right side) : windows (Win and Linux), apple (MacOS), ... - Menu, - LBracket, ///< [ - RBracket, ///< ] - SemiColon, ///< ; - Comma, ///< , - Period, ///< . - Quote, ///< ' - Slash, ///< / - BackSlash, - Tilde, ///< ~ - Equal, ///< = - Dash, ///< - - Space, - Return, - Back, - Tab, - PageUp, - PageDown, - End, - Home, - Insert, - Delete, - Add, ///< + - Subtract, ///< - - Multiply, ///< * - Divide, ///< / - Left, ///< Left arrow - Right, ///< Right arrow - Up, ///< Up arrow - Down, ///< Down arrow - Numpad0, - Numpad1, - Numpad2, - Numpad3, - Numpad4, - Numpad5, - Numpad6, - Numpad7, - Numpad8, - Numpad9, - F1, - F2, - F3, - F4, - F5, - F6, - F7, - F8, - F9, - F10, - F11, - F12, - F13, - F14, - F15, - Pause, - - Count // For internal use - }; -} - - -//////////////////////////////////////////////////////////// -/// Definition of button codes for mouse events -//////////////////////////////////////////////////////////// -namespace Mouse -{ - enum Button - { - Left, - Right, - Middle, - XButton1, - XButton2, - - Count // For internal use - }; -} - - -//////////////////////////////////////////////////////////// -/// Definition of joystick axis for joystick events -//////////////////////////////////////////////////////////// -namespace Joy -{ - enum Axis - { - AxisX, - AxisY, - AxisZ, - AxisR, - AxisU, - AxisV, - AxisPOV, - - Count // For internal use - }; -} - - -//////////////////////////////////////////////////////////// -/// Event defines a system event and its parameters -//////////////////////////////////////////////////////////// -class Event -{ -public : - - //////////////////////////////////////////////////////////// - /// Keyboard event parameters - //////////////////////////////////////////////////////////// - struct KeyEvent - { - Key::Code Code; - bool Alt; - bool Control; - bool Shift; - }; - - //////////////////////////////////////////////////////////// - /// Text event parameters - //////////////////////////////////////////////////////////// - struct TextEvent - { - unsigned short Unicode; - }; - - //////////////////////////////////////////////////////////// - /// Mouse move event parameters - //////////////////////////////////////////////////////////// - struct MouseMoveEvent - { - unsigned int X; - unsigned int Y; - }; - - //////////////////////////////////////////////////////////// - /// Mouse buttons events parameters - //////////////////////////////////////////////////////////// - struct MouseButtonEvent - { - Mouse::Button Button; - }; - - //////////////////////////////////////////////////////////// - /// Mouse wheel events parameters - //////////////////////////////////////////////////////////// - struct MouseWheelEvent - { - int Delta; - }; - - //////////////////////////////////////////////////////////// - /// Joystick axis move event parameters - //////////////////////////////////////////////////////////// - struct JoyMoveEvent - { - unsigned int JoystickId; - Joy::Axis Axis; - float Position; - }; - - //////////////////////////////////////////////////////////// - /// Joystick buttons events parameters - //////////////////////////////////////////////////////////// - struct JoyButtonEvent - { - unsigned int JoystickId; - unsigned int Button; - }; - - //////////////////////////////////////////////////////////// - /// Size events parameters - //////////////////////////////////////////////////////////// - struct SizeEvent - { - unsigned int Width; - unsigned int Height; - }; - - //////////////////////////////////////////////////////////// - /// Enumeration of the different types of events - //////////////////////////////////////////////////////////// - enum EventType - { - Closed, - Resized, - LostFocus, - GainedFocus, - TextEntered, - KeyPressed, - KeyReleased, - MouseWheelMoved, - MouseButtonPressed, - MouseButtonReleased, - MouseMoved, - JoyButtonPressed, - JoyButtonReleased, - JoyMoved - }; - - //////////////////////////////////////////////////////////// - // Member data - //////////////////////////////////////////////////////////// - EventType Type; ///< Type of the event - - union - { - KeyEvent Key; - TextEvent Text; - MouseMoveEvent MouseMove; - MouseButtonEvent MouseButton; - MouseWheelEvent MouseWheel; - JoyMoveEvent JoyMove; - JoyButtonEvent JoyButton; - SizeEvent Size; - }; -}; - -} // namespace sf - - -#endif // SFML_EVENT_HPP +// SFML - Simple and Fast Multimedia Library +// Copyright (C) 2007-2008 Laurent Gomila (laurent.gom@gmail.com) +// +// This software is provided 'as-is', without any express or implied warranty. +// In no event will the authors be held liable for any damages arising from the use of this software. +// +// Permission is granted to anyone to use this software for any purpose, +// including commercial applications, and to alter it and redistribute it freely, +// subject to the following restrictions: +// +// 1. The origin of this software must not be misrepresented; +// you must not claim that you wrote the original software. +// If you use this software in a product, an acknowledgment +// in the product documentation would be appreciated but is not required. +// +// 2. Altered source versions must be plainly marked as such, +// and must not be misrepresented as being the original software. +// +// 3. This notice may not be removed or altered from any source distribution. + +#ifndef SFML_EVENT_HPP +#define SFML_EVENT_HPP + + +namespace sf +{ + namespace Key + { + enum Code + { + A = 'a', + B = 'b', + C = 'c', + D = 'd', + E = 'e', + F = 'f', + G = 'g', + H = 'h', + I = 'i', + J = 'j', + K = 'k', + L = 'l', + M = 'm', + N = 'n', + O = 'o', + P = 'p', + Q = 'q', + R = 'r', + S = 's', + T = 't', + U = 'u', + V = 'v', + W = 'w', + X = 'x', + Y = 'y', + Z = 'z', + Num0 = '0', + Num1 = '1', + Num2 = '2', + Num3 = '3', + Num4 = '4', + Num5 = '5', + Num6 = '6', + Num7 = '7', + Num8 = '8', + Num9 = '9', + Escape = 256, + LControl, + LShift, + LAlt, + LSystem, + RControl, + RShift, + RAlt, + RSystem, + Menu, + LBracket, + RBracket, + SemiColon, + Comma, + Period, + Quote, + Slash, + BackSlash, + Tilde, + Equal, + Dash, + Space, + Return, + Back, + Tab, + PageUp, + PageDown, + End, + Home, + Insert, + Delete, + Add, + Subtract, + Multiply, + Divide, + Left, + Right, + Up, + Down, + Numpad0, + Numpad1, + Numpad2, + Numpad3, + Numpad4, + Numpad5, + Numpad6, + Numpad7, + Numpad8, + Numpad9, + F1, + F2, + F3, + F4, + F5, + F6, + F7, + F8, + F9, + F10, + F11, + F12, + F13, + F14, + F15, + Pause, + + Count // For internal use + }; + } + + + namespace Mouse + { + enum Button + { + Left, + Right, + Middle, + XButton1, + XButton2, + + Count // For internal use + }; + } + + + namespace Joy + { + enum Axis + { + AxisX, + AxisY, + AxisZ, + AxisR, + AxisU, + AxisV, + AxisPOV, + + Count // For internal use + }; + } + + + class Event + { + public : + + struct KeyEvent + { + Key::Code Code; + bool Alt; + bool Control; + bool Shift; + }; + + struct TextEvent + { + // I'm not sure we need this... + unsigned short Unicode; + }; + + struct MouseMoveEvent + { + int X; + int Y; + }; + + struct MouseButtonEvent + { + Mouse::Button Button; + int X; + int Y; + }; + + struct MouseWheelEvent + { + int Delta; + }; + + struct JoyMoveEvent + { + unsigned int JoystickId; + Joy::Axis Axis; + float Position; + }; + + struct JoyButtonEvent + { + unsigned int JoystickId; + unsigned int Button; + }; + + struct SizeEvent + { + unsigned int Width; + unsigned int Height; + }; + + enum EventType + { + Closed, + Resized, + LostFocus, + GainedFocus, + TextEntered, + KeyPressed, + KeyReleased, + MouseWheelMoved, + MouseButtonPressed, + MouseButtonReleased, + MouseMoved, + MouseEntered, + MouseLeft, + JoyButtonPressed, + JoyButtonReleased, + JoyMoved + }; + + // Member data + EventType Type; + + union + { + KeyEvent Key; + TextEvent Text; + MouseMoveEvent MouseMove; + MouseButtonEvent MouseButton; + MouseWheelEvent MouseWheel; + JoyMoveEvent JoyMove; + JoyButtonEvent JoyButton; + SizeEvent Size; + }; + }; + +} // namespace sf + + +#endif // SFML_EVENT_HPP diff --git a/Source/TestSuite/TestSuite.sln b/Source/TestSuite/TestSuite.sln index f1f189ccad..5f1e5516b8 100644 --- a/Source/TestSuite/TestSuite.sln +++ b/Source/TestSuite/TestSuite.sln @@ -19,40 +19,23 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WPAD", "WPAD\WPAD.vcproj", EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 Release|Win32 = Release|Win32 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {F45E42B2-939B-4F02-954B-E68251FD4CCF}.Debug|Win32.ActiveCfg = Debug|Win32 - {F45E42B2-939B-4F02-954B-E68251FD4CCF}.Debug|Win32.Build.0 = Debug|Win32 {F45E42B2-939B-4F02-954B-E68251FD4CCF}.Release|Win32.ActiveCfg = Release|Win32 {F45E42B2-939B-4F02-954B-E68251FD4CCF}.Release|Win32.Build.0 = Release|Win32 - {87F20A25-A3F8-46A3-AC32-3C16782494B1}.Debug|Win32.ActiveCfg = Debug|Win32 - {87F20A25-A3F8-46A3-AC32-3C16782494B1}.Debug|Win32.Build.0 = Debug|Win32 {87F20A25-A3F8-46A3-AC32-3C16782494B1}.Release|Win32.ActiveCfg = Release|Win32 {87F20A25-A3F8-46A3-AC32-3C16782494B1}.Release|Win32.Build.0 = Release|Win32 - {62989D24-DB3F-4BD1-A11D-26F0487CD9AF}.Debug|Win32.ActiveCfg = Debug|Win32 - {62989D24-DB3F-4BD1-A11D-26F0487CD9AF}.Debug|Win32.Build.0 = Debug|Win32 {62989D24-DB3F-4BD1-A11D-26F0487CD9AF}.Release|Win32.ActiveCfg = Release|Win32 {62989D24-DB3F-4BD1-A11D-26F0487CD9AF}.Release|Win32.Build.0 = Release|Win32 - {D58C9AD5-7200-488A-B1E8-9250E64CDD45}.Debug|Win32.ActiveCfg = Debug|Win32 - {D58C9AD5-7200-488A-B1E8-9250E64CDD45}.Debug|Win32.Build.0 = Debug|Win32 {D58C9AD5-7200-488A-B1E8-9250E64CDD45}.Release|Win32.ActiveCfg = Release|Win32 {D58C9AD5-7200-488A-B1E8-9250E64CDD45}.Release|Win32.Build.0 = Release|Win32 - {AA230C1A-42F2-4BDC-9EB8-4AA6DF587E69}.Debug|Win32.ActiveCfg = Debug|Win32 - {AA230C1A-42F2-4BDC-9EB8-4AA6DF587E69}.Debug|Win32.Build.0 = Debug|Win32 {AA230C1A-42F2-4BDC-9EB8-4AA6DF587E69}.Release|Win32.ActiveCfg = Release|Win32 {AA230C1A-42F2-4BDC-9EB8-4AA6DF587E69}.Release|Win32.Build.0 = Release|Win32 - {9F053346-A33D-4E4F-874E-CBA1AF809FC3}.Debug|Win32.ActiveCfg = Debug|Win32 - {9F053346-A33D-4E4F-874E-CBA1AF809FC3}.Debug|Win32.Build.0 = Debug|Win32 {9F053346-A33D-4E4F-874E-CBA1AF809FC3}.Release|Win32.ActiveCfg = Release|Win32 {9F053346-A33D-4E4F-874E-CBA1AF809FC3}.Release|Win32.Build.0 = Release|Win32 - {E50732C5-038A-42F7-8C95-8C02A4E2ADA6}.Debug|Win32.ActiveCfg = Debug|Win32 - {E50732C5-038A-42F7-8C95-8C02A4E2ADA6}.Debug|Win32.Build.0 = Debug|Win32 {E50732C5-038A-42F7-8C95-8C02A4E2ADA6}.Release|Win32.ActiveCfg = Release|Win32 {E50732C5-038A-42F7-8C95-8C02A4E2ADA6}.Release|Win32.Build.0 = Release|Win32 - {BB88F4D5-EB0D-4429-94C3-93B0191BD3DD}.Debug|Win32.ActiveCfg = Debug|Win32 - {BB88F4D5-EB0D-4429-94C3-93B0191BD3DD}.Debug|Win32.Build.0 = Debug|Win32 {BB88F4D5-EB0D-4429-94C3-93B0191BD3DD}.Release|Win32.ActiveCfg = Release|Win32 {BB88F4D5-EB0D-4429-94C3-93B0191BD3DD}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection