Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-05 21:50:18 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #21881 - pyfisch:keyboard-types, r=paulrouget

Browse source 
Use keyboard-types crate

Have embedders send DOM keys to servo and use a strongly typed KeyboardEvent
from the W3C UI Events spec. All keyboard handling now uses the new types.

Introduce a ShortcutMatcher to recognize key bindings. Shortcuts are now
recognized in a uniform way.

Updated the winit port.
Updated webdriver integration.

part of #20331

What this PR does:

* allow the use non-ASCII keyboards for text input
* decouple keyboard event "key" from "code" (key meaning vs location)

What this PR does not do:

* completely improve keyboard events send from winit and webdriver
* add support for CompositionEvent or IME

Notes:

* The winit embedder does not send keyup events for printable keys (this is a regression)
* keyboard-types is on crates.io because I believe it to be useful outside of servo. If you prefer I can add a copy in this repo.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/21881)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2018-10-17 05:36:08 -04:00 • committed by GitHub
commit 9a0404ac5f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
35 changed files with 747 additions and 1673 deletions
Download patch file Download diff file Expand all files Collapse all files

12
components/servo/lib.rs
View file

@ -109,7 +109,7 @@ use webvr::{WebVRThread, WebVRCompositorHandler};
pub use gleam::gl;
pub use servo_config as config;
pub use servo_url as url;
pub use msg::constellation_msg::{KeyState, TopLevelBrowsingContextId as BrowserId};
pub use msg::constellation_msg::{TopLevelBrowsingContextId as BrowserId};
/// The in-process interface to Servo.
///
@ -320,10 +320,10 @@ where
}
},
WindowEvent::KeyEvent(ch, key, state, modifiers) => {
let msg = ConstellationMsg::KeyEvent(ch, key, state, modifiers);
WindowEvent::Keyboard(key_event) => {
let msg = ConstellationMsg::Keyboard(key_event);
if let Err(e) = self.constellation_chan.send(msg) {
warn!("Sending key event to constellation failed ({:?}).", e);
warn!("Sending keyboard event to constellation failed ({:?}).", e);
}
},
@ -399,12 +399,12 @@ where
(_, ShutdownState::ShuttingDown) => {},
(
EmbedderMsg::KeyEvent(ch, key, state, modified),
EmbedderMsg::Keyboard(key_event),
ShutdownState::NotShuttingDown,
) => {
let event = (
top_level_browsing_context,
EmbedderMsg::KeyEvent(ch, key, state, modified),
EmbedderMsg::Keyboard(key_event),
);
self.embedder_events.push(event);
},