From 21aad00612d0f3fbd6e207e5a65d677ffb6dbc6f Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sun, 5 Mar 2017 13:58:45 +0100
Subject: [PATCH] Don't pass key events to the viewer when Alt modifier is held

Fixes the stats panel briefly showing up when using 'Alt+F4' to exit.
---
 components/sdlutil/sdlinputwrapper.cpp | 6 +++---
 components/sdlutil/sdlinputwrapper.hpp | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/components/sdlutil/sdlinputwrapper.cpp b/components/sdlutil/sdlinputwrapper.cpp
index a1c5e42b1..204680b44 100644
--- a/components/sdlutil/sdlinputwrapper.cpp
+++ b/components/sdlutil/sdlinputwrapper.cpp
@@ -90,7 +90,7 @@ InputWrapper::InputWrapper(SDL_Window* window, osg::ref_ptr<osgViewer::Viewer> v
                     {
                         mKeyboardListener->keyPressed(evt.key);
 
-                        if (evt.key.keysym.sym >= SDLK_F1 && evt.key.keysym.sym <= SDLK_F12)
+                        if (!isModifierHeld(KMOD_ALT) && evt.key.keysym.sym >= SDLK_F1 && evt.key.keysym.sym <= SDLK_F12)
                         {
                             mViewer->getEventQueue()->keyPress(osgGA::GUIEventAdapter::KEY_F1 + (evt.key.keysym.sym - SDLK_F1));
                         }
@@ -102,7 +102,7 @@ InputWrapper::InputWrapper(SDL_Window* window, osg::ref_ptr<osgViewer::Viewer> v
                     {
                         mKeyboardListener->keyReleased(evt.key);
 
-                        if (evt.key.keysym.sym >= SDLK_F1 && evt.key.keysym.sym <= SDLK_F12)
+                        if (!isModifierHeld(KMOD_ALT) && evt.key.keysym.sym >= SDLK_F1 && evt.key.keysym.sym <= SDLK_F12)
                             mViewer->getEventQueue()->keyRelease(osgGA::GUIEventAdapter::KEY_F1 + (evt.key.keysym.sym - SDLK_F1));
                     }
 
@@ -231,7 +231,7 @@ InputWrapper::InputWrapper(SDL_Window* window, osg::ref_ptr<osgViewer::Viewer> v
         }
     }
 
-    bool InputWrapper::isModifierHeld(SDL_Keymod mod)
+    bool InputWrapper::isModifierHeld(int mod)
     {
         return (SDL_GetModState() & mod) != 0;
     }
diff --git a/components/sdlutil/sdlinputwrapper.hpp b/components/sdlutil/sdlinputwrapper.hpp
index 62d6a565c..8387cbd6f 100644
--- a/components/sdlutil/sdlinputwrapper.hpp
+++ b/components/sdlutil/sdlinputwrapper.hpp
@@ -31,7 +31,7 @@ namespace SDLUtil
         void setControllerEventCallback(ControllerListener* listen) { mConListener = listen; }
 
         void capture(bool windowEventsOnly);
-        bool isModifierHeld(SDL_Keymod mod);
+        bool isModifierHeld(int mod);
         bool isKeyDown(SDL_Scancode key);
 
         void setMouseVisible (bool visible);