actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

alt-enter, etc. check modifier state at the time of the press

Browse Source
This commit is contained in:
Glenn Maynard
2006-09-08 04:16:10 +00:00
parent 0506ca384b
commit a2923556c9
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/StepMania.cpp
+10 -10
View File
@@ -1294,8 +1294,8 @@ bool HandleGlobalInputs( const InputEventPlus &input )
#if !defined(MACOSX) #if !defined(MACOSX)
if( input.DeviceI == DeviceInput(DEVICE_KEYBOARD, KEY_F4) ) if( input.DeviceI == DeviceInput(DEVICE_KEYBOARD, KEY_F4) )
{ {
if( INPUTFILTER->IsBeingPressed( DeviceInput(DEVICE_KEYBOARD, KEY_RALT)) || if( INPUTFILTER->IsBeingPressed( DeviceInput(DEVICE_KEYBOARD, KEY_RALT), &input.InputList) ||
INPUTFILTER->IsBeingPressed( DeviceInput(DEVICE_KEYBOARD, KEY_LALT)) ) INPUTFILTER->IsBeingPressed( DeviceInput(DEVICE_KEYBOARD, KEY_LALT), &input.InputList) )
{ {
// pressed Alt+F4 // pressed Alt+F4
ArchHooks::SetUserQuit(); ArchHooks::SetUserQuit();
@@ -1304,8 +1304,8 @@ bool HandleGlobalInputs( const InputEventPlus &input )
} }
#else #else
if( input.DeviceI == DeviceInput(DEVICE_KEYBOARD, KEY_Cq) && if( input.DeviceI == DeviceInput(DEVICE_KEYBOARD, KEY_Cq) &&
(INPUTFILTER->IsBeingPressed( DeviceInput(DEVICE_KEYBOARD, KEY_LMETA) ) || (INPUTFILTER->IsBeingPressed( DeviceInput(DEVICE_KEYBOARD, KEY_LMETA), &input.InputList ) ||
INPUTFILTER->IsBeingPressed( DeviceInput(DEVICE_KEYBOARD, KEY_RMETA) )) ) INPUTFILTER->IsBeingPressed( DeviceInput(DEVICE_KEYBOARD, KEY_RMETA), &input.InputList )) )
{ {
/* The user quit is handled by the menu item so we don't need to set it here; /* The user quit is handled by the menu item so we don't need to set it here;
* however, we do want to return that it has been handled since this will happen * however, we do want to return that it has been handled since this will happen
@@ -1320,8 +1320,8 @@ bool HandleGlobalInputs( const InputEventPlus &input )
input.DeviceI == DeviceInput( DEVICE_KEYBOARD, KEY_PRTSC ) || input.DeviceI == DeviceInput( DEVICE_KEYBOARD, KEY_PRTSC ) ||
input.DeviceI == DeviceInput( DEVICE_KEYBOARD, KEY_F13 ) || input.DeviceI == DeviceInput( DEVICE_KEYBOARD, KEY_F13 ) ||
( input.DeviceI == DeviceInput(DEVICE_KEYBOARD, KEY_F12) && ( input.DeviceI == DeviceInput(DEVICE_KEYBOARD, KEY_F12) &&
(INPUTFILTER->IsBeingPressed(DeviceInput(DEVICE_KEYBOARD, KEY_LMETA)) || (INPUTFILTER->IsBeingPressed(DeviceInput(DEVICE_KEYBOARD, KEY_LMETA), &input.InputList) ||
INPUTFILTER->IsBeingPressed(DeviceInput(DEVICE_KEYBOARD, KEY_RMETA))) ); INPUTFILTER->IsBeingPressed(DeviceInput(DEVICE_KEYBOARD, KEY_RMETA), &input.InputList)) );
#else #else
/* The default Windows message handler will capture the desktop window upon /* The default Windows message handler will capture the desktop window upon
@@ -1330,8 +1330,8 @@ bool HandleGlobalInputs( const InputEventPlus &input )
* ourself by dumping the frame buffer. */ * ourself by dumping the frame buffer. */
// "if pressing PrintScreen and not pressing Alt" // "if pressing PrintScreen and not pressing Alt"
input.DeviceI == DeviceInput(DEVICE_KEYBOARD, KEY_PRTSC) && input.DeviceI == DeviceInput(DEVICE_KEYBOARD, KEY_PRTSC) &&
!INPUTFILTER->IsBeingPressed(DeviceInput(DEVICE_KEYBOARD, KEY_LALT)) && !INPUTFILTER->IsBeingPressed(DeviceInput(DEVICE_KEYBOARD, KEY_LALT), &input.InputList) &&
!INPUTFILTER->IsBeingPressed(DeviceInput(DEVICE_KEYBOARD, KEY_RALT)); !INPUTFILTER->IsBeingPressed(DeviceInput(DEVICE_KEYBOARD, KEY_RALT), &input.InputList);
#endif #endif
if( bDoScreenshot ) if( bDoScreenshot )
{ {
@@ -1342,8 +1342,8 @@ bool HandleGlobalInputs( const InputEventPlus &input )
} }
if( input.DeviceI == DeviceInput(DEVICE_KEYBOARD, KEY_ENTER) && if( input.DeviceI == DeviceInput(DEVICE_KEYBOARD, KEY_ENTER) &&
(INPUTFILTER->IsBeingPressed(DeviceInput(DEVICE_KEYBOARD, KEY_RALT)) || (INPUTFILTER->IsBeingPressed(DeviceInput(DEVICE_KEYBOARD, KEY_RALT), &input.InputList) ||
INPUTFILTER->IsBeingPressed(DeviceInput(DEVICE_KEYBOARD, KEY_LALT))) ) INPUTFILTER->IsBeingPressed(DeviceInput(DEVICE_KEYBOARD, KEY_LALT), &input.InputList)) )
{ {
/* alt-enter */ /* alt-enter */
/* In OS X, this is a menu item and will be handled as such. This will happen /* In OS X, this is a menu item and will be handled as such. This will happen