mirror of
https://github.com/servo/servo.git
synced 2025-07-13 02:13:40 +01:00
Use keyboard-types::webdriver::send_keys
This improves the quality of KeyboardEvents sent by WebDriver. Now key, code, location and modifiers are set according to spec. CompositionEvents are discarded as servo does not handle them at all.
This commit is contained in:
Pyfisch
parent
b60006ae11
commit
2143657e03
12 changed files with 30 additions and 130 deletions
|
|
@ -22,7 +22,7 @@ gleam = {version = "0.6", optional = true}
|
|||
image = "0.19"
|
||||
ipc-channel = "0.11"
|
||||
libc = "0.2"
|
||||
keyboard-types = {version = "0.4.2-servo", features = ["serde"]}
|
||||
keyboard-types = "0.4.3"
|
||||
log = "0.4"
|
||||
msg = {path = "../msg"}
|
||||
net_traits = {path = "../net_traits"}
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ gfx_traits = {path = "../gfx_traits"}
|
|||
http = "0.1"
|
||||
ipc-channel = "0.11"
|
||||
layout_traits = {path = "../layout_traits"}
|
||||
keyboard-types = {version = "0.4.2-servo", features = ["serde"]}
|
||||
keyboard-types = "0.4.3"
|
||||
log = "0.4"
|
||||
metrics = {path = "../metrics"}
|
||||
msg = {path = "../msg"}
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ path = "lib.rs"
|
|||
|
||||
[dependencies]
|
||||
ipc-channel = "0.11"
|
||||
keyboard-types = {version = "0.4.2-servo", features = ["serde"]}
|
||||
keyboard-types = "0.4.3"
|
||||
lazy_static = "1"
|
||||
log = "0.4"
|
||||
msg = {path = "../msg"}
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ euclid = "0.19"
|
|||
hashglobe = { path = "../hashglobe" }
|
||||
hyper = { version = "0.12", optional = true }
|
||||
hyper_serde = { version = "0.9", optional = true }
|
||||
keyboard-types = {version = "0.4.2-servo", features = ["serde"], optional = true}
|
||||
keyboard-types = {version = "0.4.3", optional = true}
|
||||
mozjs = { version = "0.9.3", optional = true }
|
||||
selectors = { path = "../selectors" }
|
||||
serde = { version = "1.0.27", optional = true }
|
||||
|
|
|
|||
|
|
@ -65,7 +65,7 @@ ipc-channel = "0.11"
|
|||
itertools = "0.7.6"
|
||||
js = {package = "mozjs", version = "0.9.3"}
|
||||
jstraceable_derive = {path = "../jstraceable_derive"}
|
||||
keyboard-types = {version = "0.4.2-servo", features = ["serde"]}
|
||||
keyboard-types = "0.4.3"
|
||||
lazy_static = "1"
|
||||
libc = "0.2"
|
||||
log = "0.4"
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ http = "0.1"
|
|||
hyper = "0.12"
|
||||
hyper_serde = "0.9"
|
||||
ipc-channel = "0.11"
|
||||
keyboard-types = {version = "0.4.2-servo", features = ["serde"]}
|
||||
keyboard-types = "0.4.3"
|
||||
libc = "0.2"
|
||||
malloc_size_of = { path = "../malloc_size_of" }
|
||||
malloc_size_of_derive = { path = "../malloc_size_of_derive" }
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ euclid = "0.19"
|
|||
hyper = "0.12"
|
||||
image = "0.19"
|
||||
ipc-channel = "0.11"
|
||||
keyboard-types = {version = "0.4.2-servo", features = ["serde"]}
|
||||
keyboard-types = "0.4.3"
|
||||
log = "0.4"
|
||||
msg = {path = "../msg"}
|
||||
net_traits = {path = "../net_traits"}
|
||||
|
|
|
|||
|
|
@ -1,106 +0,0 @@
|
|||
/* This Source Code Form is subject to the terms of the Mozilla Public
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
use keyboard_types::{Key, KeyboardEvent};
|
||||
|
||||
// spec: https://w3c.github.io/webdriver/#keyboard-actions
|
||||
// normalised (sic) as in british spelling
|
||||
fn get_normalised_key_value(key: char) -> Key {
|
||||
match key {
|
||||
'\u{E000}' => Key::Unidentified,
|
||||
'\u{E001}' => Key::Cancel,
|
||||
'\u{E002}' => Key::Help,
|
||||
'\u{E003}' => Key::Backspace,
|
||||
'\u{E004}' => Key::Tab,
|
||||
'\u{E005}' => Key::Clear,
|
||||
// FIXME(pyfisch): spec says "Return"
|
||||
'\u{E006}' => Key::Enter,
|
||||
'\u{E007}' => Key::Enter,
|
||||
'\u{E008}' => Key::Shift,
|
||||
'\u{E009}' => Key::Control,
|
||||
'\u{E00A}' => Key::Alt,
|
||||
'\u{E00B}' => Key::Pause,
|
||||
'\u{E00C}' => Key::Escape,
|
||||
'\u{E00D}' => Key::Character(" ".to_string()),
|
||||
'\u{E00E}' => Key::PageUp,
|
||||
'\u{E00F}' => Key::PageDown,
|
||||
'\u{E010}' => Key::End,
|
||||
'\u{E011}' => Key::Home,
|
||||
'\u{E012}' => Key::ArrowLeft,
|
||||
'\u{E013}' => Key::ArrowUp,
|
||||
'\u{E014}' => Key::ArrowRight,
|
||||
'\u{E015}' => Key::ArrowDown,
|
||||
'\u{E016}' => Key::Insert,
|
||||
'\u{E017}' => Key::Delete,
|
||||
'\u{E018}' => Key::Character(";".to_string()),
|
||||
'\u{E019}' => Key::Character("=".to_string()),
|
||||
'\u{E01A}' => Key::Character("0".to_string()),
|
||||
'\u{E01B}' => Key::Character("1".to_string()),
|
||||
'\u{E01C}' => Key::Character("2".to_string()),
|
||||
'\u{E01D}' => Key::Character("3".to_string()),
|
||||
'\u{E01E}' => Key::Character("4".to_string()),
|
||||
'\u{E01F}' => Key::Character("5".to_string()),
|
||||
'\u{E020}' => Key::Character("6".to_string()),
|
||||
'\u{E021}' => Key::Character("7".to_string()),
|
||||
'\u{E022}' => Key::Character("8".to_string()),
|
||||
'\u{E023}' => Key::Character("9".to_string()),
|
||||
'\u{E024}' => Key::Character("*".to_string()),
|
||||
'\u{E025}' => Key::Character("+".to_string()),
|
||||
'\u{E026}' => Key::Character(",".to_string()),
|
||||
'\u{E027}' => Key::Character("-".to_string()),
|
||||
'\u{E028}' => Key::Character(".".to_string()),
|
||||
'\u{E029}' => Key::Character("/".to_string()),
|
||||
'\u{E031}' => Key::F1,
|
||||
'\u{E032}' => Key::F2,
|
||||
'\u{E033}' => Key::F3,
|
||||
'\u{E034}' => Key::F4,
|
||||
'\u{E035}' => Key::F5,
|
||||
'\u{E036}' => Key::F6,
|
||||
'\u{E037}' => Key::F7,
|
||||
'\u{E038}' => Key::F8,
|
||||
'\u{E039}' => Key::F9,
|
||||
'\u{E03A}' => Key::F10,
|
||||
'\u{E03B}' => Key::F11,
|
||||
'\u{E03C}' => Key::F12,
|
||||
'\u{E03D}' => Key::Meta,
|
||||
'\u{E040}' => Key::ZenkakuHankaku,
|
||||
'\u{E050}' => Key::Shift,
|
||||
'\u{E051}' => Key::Control,
|
||||
'\u{E052}' => Key::Alt,
|
||||
'\u{E053}' => Key::Meta,
|
||||
'\u{E054}' => Key::PageUp,
|
||||
'\u{E055}' => Key::PageDown,
|
||||
'\u{E056}' => Key::End,
|
||||
'\u{E057}' => Key::Home,
|
||||
'\u{E058}' => Key::ArrowLeft,
|
||||
'\u{E059}' => Key::ArrowUp,
|
||||
'\u{E05A}' => Key::ArrowRight,
|
||||
'\u{E05B}' => Key::ArrowDown,
|
||||
'\u{E05C}' => Key::Insert,
|
||||
'\u{E05D}' => Key::Delete,
|
||||
_ => Key::Character(key.to_string()),
|
||||
}
|
||||
}
|
||||
|
||||
pub fn keycodes_to_keys(key_codes: &str) -> Vec<KeyboardEvent> {
|
||||
let mut rv = vec![];
|
||||
|
||||
for char_code in key_codes.chars() {
|
||||
// TODO(pyfisch): compute code, location, modifiers according to spec
|
||||
let key = get_normalised_key_value(char_code);
|
||||
let mut event = KeyboardEvent {
|
||||
state: ::keyboard_types::KeyState::Down,
|
||||
key,
|
||||
code: ::keyboard_types::Code::Unidentified,
|
||||
location: ::keyboard_types::Location::Standard,
|
||||
modifiers: ::keyboard_types::Modifiers::empty(),
|
||||
repeat: false,
|
||||
is_composing: false,
|
||||
};
|
||||
rv.push(event.clone());
|
||||
event.state = ::keyboard_types::KeyState::Up;
|
||||
rv.push(event);
|
||||
}
|
||||
rv
|
||||
}
|
||||
|
|
@ -11,14 +11,12 @@ extern crate log;
|
|||
#[macro_use]
|
||||
extern crate serde;
|
||||
|
||||
mod keys;
|
||||
|
||||
use base64;
|
||||
use crate::keys::keycodes_to_keys;
|
||||
use euclid::TypedSize2D;
|
||||
use hyper::Method;
|
||||
use image::{DynamicImage, ImageFormat, RgbImage};
|
||||
use ipc_channel::ipc::{self, IpcReceiver, IpcSender};
|
||||
use keyboard_types::webdriver::{send_keys, Event as KeyEvent};
|
||||
use msg::constellation_msg::{BrowsingContextId, TopLevelBrowsingContextId, TraversalDirection};
|
||||
use net_traits::image::base::PixelFormat;
|
||||
use regex::Captures;
|
||||
|
|
@ -1038,7 +1036,14 @@ impl Handler {
|
|||
))
|
||||
})?;
|
||||
|
||||
let keys = keycodes_to_keys(&keys.text);
|
||||
// FIXME: Don't discard composition events.
|
||||
let keys = send_keys(&keys.text)
|
||||
.drain(..)
|
||||
.filter_map(|event| match event {
|
||||
KeyEvent::Keyboard(v) => Some(v),
|
||||
_ => None,
|
||||
})
|
||||
.collect();
|
||||
|
||||
// TODO: there's a race condition caused by the focus command and the
|
||||
// send keys command being two separate messages,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue