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

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

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

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