| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 // Portions based heavily on: | 5 // Portions based heavily on: |
| 6 // third_party/WebKit/Source/WebKit/chromium/public/gtk/WebInputEventFactory.cpp | 6 // third_party/WebKit/Source/WebKit/chromium/public/gtk/WebInputEventFactory.cpp |
| 7 // | 7 // |
| 8 /* | 8 /* |
| 9 * Copyright (C) 2006-2011 Google Inc. All rights reserved. | 9 * Copyright (C) 2006-2011 Google Inc. All rights reserved. |
| 10 * | 10 * |
| (...skipping 271 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 282 default: | 282 default: |
| 283 NOTREACHED(); | 283 NOTREACHED(); |
| 284 } | 284 } |
| 285 | 285 |
| 286 if (webkit_event.modifiers & WebKit::WebInputEvent::AltKey) | 286 if (webkit_event.modifiers & WebKit::WebInputEvent::AltKey) |
| 287 webkit_event.isSystemKey = true; | 287 webkit_event.isSystemKey = true; |
| 288 | 288 |
| 289 webkit_event.windowsKeyCode = XKeyEventToWindowsKeyCode(native_key_event); | 289 webkit_event.windowsKeyCode = XKeyEventToWindowsKeyCode(native_key_event); |
| 290 webkit_event.nativeKeyCode = native_key_event->keycode; | 290 webkit_event.nativeKeyCode = native_key_event->keycode; |
| 291 | 291 |
| 292 if (webkit_event.windowsKeyCode == ui::VKEY_RETURN) { | 292 if (webkit_event.windowsKeyCode == ui::VKEY_RETURN) |
| 293 webkit_event.unmodifiedText[0] = '\r'; | 293 webkit_event.unmodifiedText[0] = '\r'; |
| 294 } else { | 294 else |
| 295 webkit_event.unmodifiedText[0] = | 295 webkit_event.unmodifiedText[0] = ui::DefaultSymbolFromXEvent(native_event); |
| 296 ui::DefaultXKeysymFromHardwareKeycode(native_key_event->keycode); | |
| 297 } | |
| 298 | 296 |
| 299 if (webkit_event.modifiers & WebKit::WebInputEvent::ControlKey) { | 297 if (webkit_event.modifiers & WebKit::WebInputEvent::ControlKey) { |
| 300 webkit_event.text[0] = | 298 webkit_event.text[0] = |
| 301 GetControlCharacter( | 299 GetControlCharacter( |
| 302 webkit_event.windowsKeyCode, | 300 webkit_event.windowsKeyCode, |
| 303 webkit_event.modifiers & WebKit::WebInputEvent::ShiftKey); | 301 webkit_event.modifiers & WebKit::WebInputEvent::ShiftKey); |
| 304 } else { | 302 } else { |
| 305 webkit_event.text[0] = webkit_event.unmodifiedText[0]; | 303 webkit_event.text[0] = webkit_event.unmodifiedText[0]; |
| 306 } | 304 } |
| 307 | 305 |
| 308 webkit_event.setKeyIdentifierFromWindowsKeyCode(); | 306 webkit_event.setKeyIdentifierFromWindowsKeyCode(); |
| 309 | 307 |
| 310 // TODO: IsAutoRepeat/IsKeyPad? | 308 // TODO: IsAutoRepeat/IsKeyPad? |
| 311 | 309 |
| 312 return webkit_event; | 310 return webkit_event; |
| 313 } | 311 } |
| 314 | 312 |
| 315 } // namespace content | 313 } // namespace content |
| OLD | NEW |