| OLD | NEW | 
|    1 /* |    1 /* | 
|    2  * Copyright (C) 2006, 2007 Apple Inc.  All rights reserved. |    2  * Copyright (C) 2006, 2007 Apple Inc.  All rights reserved. | 
|    3  * Copyright (C) 2008, 2009 Google Inc. |    3  * Copyright (C) 2008, 2009 Google Inc. | 
|    4  * |    4  * | 
|    5  * Redistribution and use in source and binary forms, with or without |    5  * Redistribution and use in source and binary forms, with or without | 
|    6  * modification, are permitted provided that the following conditions |    6  * modification, are permitted provided that the following conditions | 
|    7  * are met: |    7  * are met: | 
|    8  * 1. Redistributions of source code must retain the above copyright |    8  * 1. Redistributions of source code must retain the above copyright | 
|    9  *    notice, this list of conditions and the following disclaimer. |    9  *    notice, this list of conditions and the following disclaimer. | 
|   10  * 2. Redistributions in binary form must reproduce the above copyright |   10  * 2. Redistributions in binary form must reproduce the above copyright | 
|   11  *    notice, this list of conditions and the following disclaimer in the |   11  *    notice, this list of conditions and the following disclaimer in the | 
|   12  *    documentation and/or other materials provided with the distribution. |   12  *    documentation and/or other materials provided with the distribution. | 
|   13  * |   13  * | 
|   14  * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY |   14  * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY | 
|   15  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |   15  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | 
|   16  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR |   16  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | 
|   17  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR |   17  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR | 
|   18  * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, |   18  * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, | 
|   19  * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, |   19  * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, | 
|   20  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR |   20  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR | 
|   21  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY |   21  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY | 
|   22  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |   22  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 
|   23  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |   23  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 
|   24  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |   24  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 
|   25  */ |   25  */ | 
|   26  |   26  | 
|   27 #include "config.h" |   27 #include "config.h" | 
|   28 #include "core/platform/PlatformKeyboardEvent.h" |   28 #include "platform/PlatformKeyboardEvent.h" | 
|   29  |   29  | 
|   30 #if OS(WIN) |   30 #if OS(WIN) | 
|   31 #include <windows.h> |   31 #include <windows.h> | 
|   32 #elif OS(MACOSX) |   32 #elif OS(MACOSX) | 
|   33 #import <Carbon/Carbon.h> |   33 #import <Carbon/Carbon.h> | 
|   34 #else |   34 #else | 
|   35 #include "platform/NotImplemented.h" |   35 #include "platform/NotImplemented.h" | 
|   36 #endif |   36 #endif | 
|   37  |   37  | 
|   38 namespace WebCore { |   38 namespace WebCore { | 
|   39  |   39  | 
|   40 #if OS(WIN) |   40 #if OS(WIN) | 
|   41 static const unsigned short HIGH_BIT_MASK_SHORT = 0x8000; |   41 static const unsigned short HIGHBITMASKSHORT = 0x8000; | 
|   42 #endif |   42 #endif | 
|   43  |   43  | 
|   44 void PlatformKeyboardEvent::disambiguateKeyDownEvent(Type type) |   44 void PlatformKeyboardEvent::disambiguateKeyDownEvent(Type type) | 
|   45 { |   45 { | 
|   46 #if OS(WIN) |   46 #if OS(WIN) | 
|   47     // No KeyDown events on Windows to disambiguate. |   47     // No KeyDown events on Windows to disambiguate. | 
|   48     ASSERT_NOT_REACHED(); |   48     ASSERT_NOT_REACHED(); | 
|   49 #else |   49 #else | 
|   50     // Can only change type from KeyDown to RawKeyDown or Char, as we lack infor
     mation for other conversions. |   50     // Can only change type from KeyDown to RawKeyDown or Char, as we lack infor
     mation for other conversions. | 
|   51     ASSERT(m_type == PlatformEvent::KeyDown); |   51     ASSERT(m_type == PlatformEvent::KeyDown); | 
| (...skipping 28 matching lines...) Expand all  Loading... | 
|   80     return GetCurrentKeyModifiers() & alphaLock; |   80     return GetCurrentKeyModifiers() & alphaLock; | 
|   81 #else |   81 #else | 
|   82     notImplemented(); |   82     notImplemented(); | 
|   83     return false; |   83     return false; | 
|   84 #endif |   84 #endif | 
|   85 } |   85 } | 
|   86  |   86  | 
|   87 void PlatformKeyboardEvent::getCurrentModifierState(bool& shiftKey, bool& ctrlKe
     y, bool& altKey, bool& metaKey) |   87 void PlatformKeyboardEvent::getCurrentModifierState(bool& shiftKey, bool& ctrlKe
     y, bool& altKey, bool& metaKey) | 
|   88 { |   88 { | 
|   89 #if OS(WIN) |   89 #if OS(WIN) | 
|   90     shiftKey = GetKeyState(VK_SHIFT) & HIGH_BIT_MASK_SHORT; |   90     shiftKey = GetKeyState(VK_SHIFT) & HIGHBITMASKSHORT; | 
|   91     ctrlKey = GetKeyState(VK_CONTROL) & HIGH_BIT_MASK_SHORT; |   91     ctrlKey = GetKeyState(VK_CONTROL) & HIGHBITMASKSHORT; | 
|   92     altKey = GetKeyState(VK_MENU) & HIGH_BIT_MASK_SHORT; |   92     altKey = GetKeyState(VK_MENU) & HIGHBITMASKSHORT; | 
|   93     metaKey = false; |   93     metaKey = false; | 
|   94 #elif OS(MACOSX) |   94 #elif OS(MACOSX) | 
|   95     UInt32 currentModifiers = GetCurrentKeyModifiers(); |   95     UInt32 currentModifiers = GetCurrentKeyModifiers(); | 
|   96     shiftKey = currentModifiers & ::shiftKey; |   96     shiftKey = currentModifiers & ::shiftKey; | 
|   97     ctrlKey = currentModifiers & ::controlKey; |   97     ctrlKey = currentModifiers & ::controlKey; | 
|   98     altKey = currentModifiers & ::optionKey; |   98     altKey = currentModifiers & ::optionKey; | 
|   99     metaKey = currentModifiers & ::cmdKey; |   99     metaKey = currentModifiers & ::cmdKey; | 
|  100 #else |  100 #else | 
|  101     shiftKey = false; |  101     shiftKey = false; | 
|  102     ctrlKey = false; |  102     ctrlKey = false; | 
|  103     altKey = false; |  103     altKey = false; | 
|  104     metaKey = false; |  104     metaKey = false; | 
|  105     notImplemented(); |  105     notImplemented(); | 
|  106 #endif |  106 #endif | 
|  107 } |  107 } | 
|  108  |  108  | 
|  109 } // namespace WebCore |  109 } // namespace WebCore | 
| OLD | NEW |