mirrors/SFML
1
0
Fork 0
mirror of https://github.com/SFML/SFML.git synced 2024-11-28 22:31:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

Added the sf::Event::KeyEvent::System member (implements feature #8)

Browse Source
This commit is contained in:
Laurent Gomila 2011-04-26 21:58:03 +02:00
parent eac841ec71
commit ede01df778
13 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
bindings/c/include/SFML/Window/Event.h
View File

@ -203,6 +203,7 @@ struct sfKeyEvent
sfBool Alt;
sfBool Control;
sfBool Shift;
sfBool System;
};
////////////////////////////////////////////////////////////

1
bindings/c/src/SFML/ConvertEvent.h
View File

@ -58,6 +58,7 @@ inline void ConvertEvent(const sf::Event& SFMLEvent, sfEvent* event)
event->Key.Alt = SFMLEvent.Key.Alt ? sfTrue : sfFalse;
event->Key.Control = SFMLEvent.Key.Control ? sfTrue : sfFalse;
event->Key.Shift = SFMLEvent.Key.Shift ? sfTrue : sfFalse;
event->Key.System = SFMLEvent.Key.System ? sfTrue : sfFalse;
break;
case sfEvtMouseWheelMoved :

BIN
bindings/dotnet/extlibs/x64/csfml-audio-2.dll
View File

Binary file not shown.

BIN
bindings/dotnet/extlibs/x64/csfml-graphics-2.dll
View File

Binary file not shown.

BIN
bindings/dotnet/extlibs/x64/csfml-window-2.dll
View File

Binary file not shown.

BIN
bindings/dotnet/extlibs/x86/csfml-audio-2.dll
View File

Binary file not shown.

BIN
bindings/dotnet/extlibs/x86/csfml-graphics-2.dll
View File

Binary file not shown.

BIN
bindings/dotnet/extlibs/x86/csfml-window-2.dll
View File

Binary file not shown.

3
bindings/dotnet/src/Window/Event.cs
View File

@ -242,6 +242,9 @@ namespace SFML
/// <summary>Is the Shift modifier pressed?</summary>
public int Shift;
/// <summary>Is the System modifier pressed?</summary>
public int System;
}
////////////////////////////////////////////////////////////

7
bindings/dotnet/src/Window/EventArgs.cs
View File

@ -23,6 +23,7 @@ namespace SFML
Alt = e.Alt != 0;
Control = e.Control != 0;
Shift = e.Shift != 0;
System = e.System != 0;
}
////////////////////////////////////////////////////////////
@ -37,7 +38,8 @@ namespace SFML
" Code(" + Code + ")" +
" Alt(" + Alt + ")" +
" Control(" + Control + ")" +
" Shift(" + Shift + ")";
" Shift(" + Shift + ")" +
" System(" + System + ")";
}
/// <summary>Code of the key (see KeyCode enum)</summary>
@ -51,6 +53,9 @@ namespace SFML
/// <summary>Is the Shift modifier pressed?</summary>
public bool Shift;
/// <summary>Is the System modifier pressed?</summary>
public bool System;
}
////////////////////////////////////////////////////////////

1
include/SFML/Window/Event.hpp
View File

@ -215,6 +215,7 @@ public :
bool Alt; ///< Is the Alt key pressed?
bool Control; ///< Is the Control key pressed?
bool Shift; ///< Is the Shift key pressed?
bool System; ///< Is the System key pressed?
};
////////////////////////////////////////////////////////////

3
src/SFML/Window/Linux/WindowImplX11.cpp
View File

@ -686,12 +686,14 @@ bool WindowImplX11::ProcessEvent(XEvent windowEvent)
XLookupString(&windowEvent.xkey, buffer, sizeof(buffer), &symbol, &keyboard);
// Fill the event parameters
// TODO: if modifiers are wrong, use XGetModifierMapping to retrieve the actual modifiers mapping
Event event;
event.Type = Event::KeyPressed;
event.Key.Code = KeysymToSF(symbol);
event.Key.Alt = windowEvent.xkey.state & Mod1Mask;
event.Key.Control = windowEvent.xkey.state & ControlMask;
event.Key.Shift = windowEvent.xkey.state & ShiftMask;
event.Key.System = windowEvent.xkey.state & Mod4Mask;
PushEvent(event);
// Generate a TextEntered event
@ -749,6 +751,7 @@ bool WindowImplX11::ProcessEvent(XEvent windowEvent)
event.Key.Alt = windowEvent.xkey.state & Mod1Mask;
event.Key.Control = windowEvent.xkey.state & ControlMask;
event.Key.Shift = windowEvent.xkey.state & ShiftMask;
event.Key.System = windowEvent.xkey.state & Mod4Mask;
PushEvent(event);
break;

2
src/SFML/Window/Win32/WindowImplWin32.cpp
View File

@ -498,6 +498,7 @@ void WindowImplWin32::ProcessEvent(UINT message, WPARAM wParam, LPARAM lParam)
event.Key.Alt = HIWORD(GetAsyncKeyState(VK_MENU)) != 0;
event.Key.Control = HIWORD(GetAsyncKeyState(VK_CONTROL)) != 0;
event.Key.Shift = HIWORD(GetAsyncKeyState(VK_SHIFT)) != 0;
event.Key.System = HIWORD(GetAsyncKeyState(VK_LWIN)) || HIWORD(GetAsyncKeyState(VK_RWIN));
event.Key.Code = VirtualKeyCodeToSF(wParam, lParam);
PushEvent(event);
}
@ -514,6 +515,7 @@ void WindowImplWin32::ProcessEvent(UINT message, WPARAM wParam, LPARAM lParam)
event.Key.Control = HIWORD(GetAsyncKeyState(VK_CONTROL)) != 0;
event.Key.Shift = HIWORD(GetAsyncKeyState(VK_SHIFT)) != 0;
event.Key.Code = VirtualKeyCodeToSF(wParam, lParam);
event.Key.System = HIWORD(GetAsyncKeyState(VK_LWIN)) || HIWORD(GetAsyncKeyState(VK_RWIN));
PushEvent(event);
break;
}