zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-11 07:11:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of https://github.com/rheit/zdoom

Browse source
This commit is contained in:
Christoph Oelckers 2016-01-09 21:10:46 +01:00
commit 68b4c23a82
2 changed files with 13 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/posix/cocoa/i_common.h
View file

@ -79,6 +79,7 @@ typedef float CGFloat;
// From HIToolbox/Events.h // From HIToolbox/Events.h
enum enum
{ {
kVK_ANSI_F = 0x03,
kVK_Return = 0x24, kVK_Return = 0x24,
kVK_Tab = 0x30, kVK_Tab = 0x30,
kVK_Space = 0x31, kVK_Space = 0x31,

12
src/posix/cocoa/i_input.mm
View file

@ -57,6 +57,8 @@ CVAR(Bool, use_mouse, true, CVAR_ARCHIVE | CVAR_GLOBALCONFIG)
CVAR(Bool, m_noprescale, false, CVAR_ARCHIVE | CVAR_GLOBALCONFIG) CVAR(Bool, m_noprescale, false, CVAR_ARCHIVE | CVAR_GLOBALCONFIG)
CVAR(Bool, m_filter, false, CVAR_ARCHIVE | CVAR_GLOBALCONFIG) CVAR(Bool, m_filter, false, CVAR_ARCHIVE | CVAR_GLOBALCONFIG)
CVAR(Bool, k_allowfullscreentoggle, true, CVAR_ARCHIVE | CVAR_GLOBALCONFIG)
CUSTOM_CVAR(Int, mouse_capturemode, 1, CVAR_GLOBALCONFIG | CVAR_ARCHIVE) CUSTOM_CVAR(Int, mouse_capturemode, 1, CVAR_GLOBALCONFIG | CVAR_ARCHIVE)
{ {
if (self < 0) if (self < 0)
@ -542,6 +544,16 @@ void ProcessKeyboardEvent(NSEvent* theEvent)
return; return;
} }
if (k_allowfullscreentoggle
&& (kVK_ANSI_F == keyCode)
&& (NSCommandKeyMask & [theEvent modifierFlags])
&& (NSKeyDown == [theEvent type])
&& ![theEvent isARepeat])
{
ToggleFullscreen = !ToggleFullscreen;
return;
}
if (GUICapture) if (GUICapture)
{ {
ProcessKeyboardEventInMenu(theEvent); ProcessKeyboardEventInMenu(theEvent);