diff options
Diffstat (limited to 'src/plugins/platforms/windows/qwindowskeymapper.cpp')
| -rw-r--r-- | src/plugins/platforms/windows/qwindowskeymapper.cpp | 46 |
1 files changed, 39 insertions, 7 deletions
diff --git a/src/plugins/platforms/windows/qwindowskeymapper.cpp b/src/plugins/platforms/windows/qwindowskeymapper.cpp index aa418a0100..d47c7df9e0 100644 --- a/src/plugins/platforms/windows/qwindowskeymapper.cpp +++ b/src/plugins/platforms/windows/qwindowskeymapper.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the plugins of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** $QT_END_LICENSE$ @@ -43,6 +43,36 @@ #include <private/qguiapplication_p.h> #include <QtGui/QKeyEvent> +#if defined(WM_APPCOMMAND) +# ifndef FAPPCOMMAND_MOUSE +# define FAPPCOMMAND_MOUSE 0x8000 +# endif +# ifndef FAPPCOMMAND_KEY +# define FAPPCOMMAND_KEY 0 +# endif +# ifndef FAPPCOMMAND_OEM +# define FAPPCOMMAND_OEM 0x1000 +# endif +# ifndef FAPPCOMMAND_MASK +# define FAPPCOMMAND_MASK 0xF000 +# endif +# ifndef GET_APPCOMMAND_LPARAM +# define GET_APPCOMMAND_LPARAM(lParam) ((short)(HIWORD(lParam) & ~FAPPCOMMAND_MASK)) +# endif +# ifndef GET_DEVICE_LPARAM +# define GET_DEVICE_LPARAM(lParam) ((WORD)(HIWORD(lParam) & FAPPCOMMAND_MASK)) +# endif +# ifndef GET_MOUSEORKEY_LPARAM +# define GET_MOUSEORKEY_LPARAM GET_DEVICE_LPARAM +# endif +# ifndef GET_FLAGS_LPARAM +# define GET_FLAGS_LPARAM(lParam) (LOWORD(lParam)) +# endif +# ifndef GET_KEYSTATE_LPARAM +# define GET_KEYSTATE_LPARAM(lParam) GET_FLAGS_LPARAM(lParam) +# endif +#endif + QT_BEGIN_NAMESPACE /*! @@ -1194,6 +1224,8 @@ Qt::KeyboardModifiers QWindowsKeyMapper::queryKeyboardModifiers() modifiers |= Qt::ControlModifier; if (GetKeyState(VK_MENU) < 0) modifiers |= Qt::AltModifier; + if (GetKeyState(VK_LWIN) < 0 || GetKeyState(VK_RWIN) < 0) + modifiers |= Qt::MetaModifier; return modifiers; } |