| 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) 2012 Google, Inc. All rights reserved. | 3 * Copyright (C) 2012 Google, Inc. All rights reserved. |
| 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 "sky/engine/config.h" | 27 #include "sky/engine/config.h" |
| 28 #include "sky/engine/core/editing/Editor.h" | 28 #include "sky/engine/core/editing/Editor.h" |
| 29 | 29 |
| 30 #include "gen/sky/core/EventTypeNames.h" |
| 30 #include "sky/engine/core/events/KeyboardEvent.h" | 31 #include "sky/engine/core/events/KeyboardEvent.h" |
| 31 #include "sky/engine/core/frame/LocalFrame.h" | 32 #include "sky/engine/core/frame/LocalFrame.h" |
| 32 #include "sky/engine/core/page/EditorClient.h" | 33 #include "sky/engine/core/page/EditorClient.h" |
| 33 #include "sky/engine/platform/PlatformKeyboardEvent.h" | |
| 34 | 34 |
| 35 namespace blink { | 35 namespace blink { |
| 36 | 36 |
| 37 bool Editor::handleEditingKeyboardEvent(KeyboardEvent* evt) | 37 bool Editor::handleEditingKeyboardEvent(KeyboardEvent* event) |
| 38 { | 38 { |
| 39 const PlatformKeyboardEvent* keyEvent = evt->keyEvent(); | 39 String commandName = behavior().interpretKeyEvent(*event); |
| 40 // do not treat this as text input if it's a system key event | |
| 41 if (!keyEvent || keyEvent->isSystemKey()) | |
| 42 return false; | |
| 43 | |
| 44 String commandName = behavior().interpretKeyEvent(*evt); | |
| 45 Command command = this->command(commandName); | 40 Command command = this->command(commandName); |
| 46 | 41 |
| 47 if (keyEvent->type() == PlatformEvent::RawKeyDown) { | 42 if (event->type() == EventTypeNames::keydown) { |
| 48 // WebKit doesn't have enough information about mode to decide how | 43 // WebKit doesn't have enough information about mode to decide how |
| 49 // commands that just insert text if executed via Editor should be treat
ed, | 44 // commands that just insert text if executed via Editor should be treat
ed, |
| 50 // so we leave it upon WebCore to either handle them immediately | 45 // so we leave it upon WebCore to either handle them immediately |
| 51 // (e.g. Tab that changes focus) or let a keypress event be generated | 46 // (e.g. Tab that changes focus) or let a keypress event be generated |
| 52 // (e.g. Tab that inserts a Tab character, or Enter). | 47 // (e.g. Tab that inserts a Tab character, or Enter). |
| 53 if (command.isTextInsertion() || commandName.isEmpty()) | 48 if (command.isTextInsertion() || commandName.isEmpty()) |
| 54 return false; | 49 return false; |
| 55 return command.execute(evt); | 50 return command.execute(event); |
| 56 } | 51 } |
| 57 | 52 |
| 58 if (command.execute(evt)) | 53 if (command.execute(event)) |
| 59 return true; | 54 return true; |
| 60 | 55 |
| 61 if (!behavior().shouldInsertCharacter(*evt) || !canEdit()) | 56 if (!behavior().shouldInsertCharacter(*event) || !canEdit()) |
| 62 return false; | 57 return false; |
| 63 | 58 |
| 64 return insertText(evt->keyEvent()->text(), evt); | 59 UChar charCode = event->charCode(); |
| 60 return insertText(String(&charCode, 1), event); |
| 65 } | 61 } |
| 66 | 62 |
| 67 void Editor::handleKeyboardEvent(KeyboardEvent* evt) | 63 void Editor::handleKeyboardEvent(KeyboardEvent* evt) |
| 68 { | 64 { |
| 69 // Give the embedder a chance to handle the keyboard event. | 65 // Give the embedder a chance to handle the keyboard event. |
| 70 if (client().handleKeyboardEvent() || handleEditingKeyboardEvent(evt)) | 66 if (client().handleKeyboardEvent() || handleEditingKeyboardEvent(evt)) |
| 71 evt->setDefaultHandled(); | 67 evt->setDefaultHandled(); |
| 72 } | 68 } |
| 73 | 69 |
| 74 } // namespace blink | 70 } // namespace blink |
| OLD | NEW |