piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 14:19:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

update to sfml 1.4. also testsuite doesn't need debug and release configs, that was an accident

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1969 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Shawn Hoffman
2009-01-21 05:46:07 +00:00
parent 0ccdb44016
commit 852c35f705
2 changed files with 264 additions and 326 deletions
Download Patch File Download Diff File Expand all files Collapse all files

573
Source/Core/InputCommon/Src/Event.hpp
View File

@ -1,309 +1,264 @@
//////////////////////////////////////////////////////////// // SFML - Simple and Fast Multimedia Library
// // Copyright (C) 2007-2008 Laurent Gomila (laurent.gom@gmail.com)
// 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.
// 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,
// Permission is granted to anyone to use this software for any purpose, // subject to the following restrictions:
// 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.
// 1. The origin of this software must not be misrepresented; // If you use this software in a product, an acknowledgment
// you must not claim that you wrote the original software. // in the product documentation would be appreciated but is not required.
// 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.
// 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.
//
// 3. This notice may not be removed or altered from any source distribution. #ifndef SFML_EVENT_HPP
// #define SFML_EVENT_HPP
////////////////////////////////////////////////////////////
#ifndef SFML_EVENT_HPP namespace sf
#define SFML_EVENT_HPP {
namespace Key
//////////////////////////////////////////////////////////// {
// Headers enum Code
//////////////////////////////////////////////////////////// {
//#include <SFML/Config.hpp> A = 'a',
B = 'b',
C = 'c',
namespace sf D = 'd',
{ E = 'e',
//////////////////////////////////////////////////////////// F = 'f',
/// Definition of key codes for keyboard events G = 'g',
//////////////////////////////////////////////////////////// H = 'h',
namespace Key I = 'i',
{ J = 'j',
enum Code K = 'k',
{ L = 'l',
A = 'a', M = 'm',
B = 'b', N = 'n',
C = 'c', O = 'o',
D = 'd', P = 'p',
E = 'e', Q = 'q',
F = 'f', R = 'r',
G = 'g', S = 's',
H = 'h', T = 't',
I = 'i', U = 'u',
J = 'j', V = 'v',
K = 'k', W = 'w',
L = 'l', X = 'x',
M = 'm', Y = 'y',
N = 'n', Z = 'z',
O = 'o', Num0 = '0',
P = 'p', Num1 = '1',
Q = 'q', Num2 = '2',
R = 'r', Num3 = '3',
S = 's', Num4 = '4',
T = 't', Num5 = '5',
U = 'u', Num6 = '6',
V = 'v', Num7 = '7',
W = 'w', Num8 = '8',
X = 'x', Num9 = '9',
Y = 'y', Escape = 256,
Z = 'z', LControl,
Num0 = '0', LShift,
Num1 = '1', LAlt,
Num2 = '2', LSystem,
Num3 = '3', RControl,
Num4 = '4', RShift,
Num5 = '5', RAlt,
Num6 = '6', RSystem,
Num7 = '7', Menu,
Num8 = '8', LBracket,
Num9 = '9', RBracket,
Escape = 256, SemiColon,
LControl, Comma,
LShift, Period,
LAlt, Quote,
LSystem, ///< OS specific key (left side) : windows (Win and Linux), apple (MacOS), ... Slash,
RControl, BackSlash,
RShift, Tilde,
RAlt, Equal,
RSystem, ///< OS specific key (right side) : windows (Win and Linux), apple (MacOS), ... Dash,
Menu, Space,
LBracket, ///< [ Return,
RBracket, ///< ] Back,
SemiColon, ///< ; Tab,
Comma, ///< , PageUp,
Period, ///< . PageDown,
Quote, ///< ' End,
Slash, ///< / Home,
BackSlash, Insert,
Tilde, ///< ~ Delete,
Equal, ///< = Add,
Dash, ///< - Subtract,
Space, Multiply,
Return, Divide,
Back, Left,
Tab, Right,
PageUp, Up,
PageDown, Down,
End, Numpad0,
Home, Numpad1,
Insert, Numpad2,
Delete, Numpad3,
Add, ///< + Numpad4,
Subtract, ///< - Numpad5,
Multiply, ///< * Numpad6,
Divide, ///< / Numpad7,
Left, ///< Left arrow Numpad8,
Right, ///< Right arrow Numpad9,
Up, ///< Up arrow F1,
Down, ///< Down arrow F2,
Numpad0, F3,
Numpad1, F4,
Numpad2, F5,
Numpad3, F6,
Numpad4, F7,
Numpad5, F8,
Numpad6, F9,
Numpad7, F10,
Numpad8, F11,
Numpad9, F12,
F1, F13,
F2, F14,
F3, F15,
F4, Pause,
F5,
F6, Count // For internal use
F7, };
F8, }
F9,
F10,
F11, namespace Mouse
F12, {
F13, enum Button
F14, {
F15, Left,
Pause, Right,
Middle,
Count // For internal use XButton1,
}; XButton2,
}
Count // For internal use
};
//////////////////////////////////////////////////////////// }
/// Definition of button codes for mouse events
////////////////////////////////////////////////////////////
namespace Mouse namespace Joy
{ {
enum Button enum Axis
{ {
Left, AxisX,
Right, AxisY,
Middle, AxisZ,
XButton1, AxisR,
XButton2, AxisU,
AxisV,
Count // For internal use AxisPOV,
};
} Count // For internal use
};
}
////////////////////////////////////////////////////////////
/// Definition of joystick axis for joystick events
//////////////////////////////////////////////////////////// class Event
namespace Joy {
{ public :
enum Axis
{ struct KeyEvent
AxisX, {
AxisY, Key::Code Code;
AxisZ, bool Alt;
AxisR, bool Control;
AxisU, bool Shift;
AxisV, };
AxisPOV,
struct TextEvent
Count // For internal use {
}; // I'm not sure we need this...
} unsigned short Unicode;
};
//////////////////////////////////////////////////////////// struct MouseMoveEvent
/// Event defines a system event and its parameters {
//////////////////////////////////////////////////////////// int X;
class Event int Y;
{ };
public :
struct MouseButtonEvent
//////////////////////////////////////////////////////////// {
/// Keyboard event parameters Mouse::Button Button;
//////////////////////////////////////////////////////////// int X;
struct KeyEvent int Y;
{ };
Key::Code Code;
bool Alt; struct MouseWheelEvent
bool Control; {
bool Shift; int Delta;
}; };
//////////////////////////////////////////////////////////// struct JoyMoveEvent
/// Text event parameters {
//////////////////////////////////////////////////////////// unsigned int JoystickId;
struct TextEvent Joy::Axis Axis;
{ float Position;
unsigned short Unicode; };
};
struct JoyButtonEvent
//////////////////////////////////////////////////////////// {
/// Mouse move event parameters unsigned int JoystickId;
//////////////////////////////////////////////////////////// unsigned int Button;
struct MouseMoveEvent };
{
unsigned int X; struct SizeEvent
unsigned int Y; {
}; unsigned int Width;
unsigned int Height;
//////////////////////////////////////////////////////////// };
/// Mouse buttons events parameters
//////////////////////////////////////////////////////////// enum EventType
struct MouseButtonEvent {
{ Closed,
Mouse::Button Button; Resized,
}; LostFocus,
GainedFocus,
//////////////////////////////////////////////////////////// TextEntered,
/// Mouse wheel events parameters KeyPressed,
//////////////////////////////////////////////////////////// KeyReleased,
struct MouseWheelEvent MouseWheelMoved,
{ MouseButtonPressed,
int Delta; MouseButtonReleased,
}; MouseMoved,
MouseEntered,
//////////////////////////////////////////////////////////// MouseLeft,
/// Joystick axis move event parameters JoyButtonPressed,
//////////////////////////////////////////////////////////// JoyButtonReleased,
struct JoyMoveEvent JoyMoved
{ };
unsigned int JoystickId;
Joy::Axis Axis; // Member data
float Position; EventType Type;
};
union
//////////////////////////////////////////////////////////// {
/// Joystick buttons events parameters KeyEvent Key;
//////////////////////////////////////////////////////////// TextEvent Text;
struct JoyButtonEvent MouseMoveEvent MouseMove;
{ MouseButtonEvent MouseButton;
unsigned int JoystickId; MouseWheelEvent MouseWheel;
unsigned int Button; JoyMoveEvent JoyMove;
}; JoyButtonEvent JoyButton;
SizeEvent Size;
//////////////////////////////////////////////////////////// };
/// Size events parameters };
////////////////////////////////////////////////////////////
struct SizeEvent } // namespace sf
{
unsigned int Width;
unsigned int Height; #endif // SFML_EVENT_HPP
};
////////////////////////////////////////////////////////////
/// 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

17
Source/TestSuite/TestSuite.sln
View File

@ -19,40 +19,23 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WPAD", "WPAD\WPAD.vcproj",
EndProject EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
Release|Win32 = Release|Win32 Release|Win32 = Release|Win32
EndGlobalSection EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution 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.ActiveCfg = Release|Win32
{F45E42B2-939B-4F02-954B-E68251FD4CCF}.Release|Win32.Build.0 = 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.ActiveCfg = Release|Win32
{87F20A25-A3F8-46A3-AC32-3C16782494B1}.Release|Win32.Build.0 = 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.ActiveCfg = Release|Win32
{62989D24-DB3F-4BD1-A11D-26F0487CD9AF}.Release|Win32.Build.0 = 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.ActiveCfg = Release|Win32
{D58C9AD5-7200-488A-B1E8-9250E64CDD45}.Release|Win32.Build.0 = 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.ActiveCfg = Release|Win32
{AA230C1A-42F2-4BDC-9EB8-4AA6DF587E69}.Release|Win32.Build.0 = 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.ActiveCfg = Release|Win32
{9F053346-A33D-4E4F-874E-CBA1AF809FC3}.Release|Win32.Build.0 = 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.ActiveCfg = Release|Win32
{E50732C5-038A-42F7-8C95-8C02A4E2ADA6}.Release|Win32.Build.0 = 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.ActiveCfg = Release|Win32
{BB88F4D5-EB0D-4429-94C3-93B0191BD3DD}.Release|Win32.Build.0 = Release|Win32 {BB88F4D5-EB0D-4429-94C3-93B0191BD3DD}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection EndGlobalSection