Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-09-27 15:20:09 +01:00
Code Issues Projects Releases Packages Wiki Activity

cargo: Upgrade keyboard-types to 0.8.0 and xcomponent-sys to 0.3.4 (#38375)

Browse source 
With some adjustment for `NamedKey`. The two crates need to be bumped
together to avoid duplicate of `keyboard-types` action.

---------

Signed-off-by: PotatoCP <Kenzie.Raditya.Tirtarahardja@huawei.com>
This commit is contained in:
Kenzie Raditya Tirtarahardja 2025-08-01 16:14:38 +08:00 • committed by GitHub
parent a063b5e78a
commit 05ad9026f5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
15 changed files with 471 additions and 432 deletions
Download patch file Download diff file Expand all files Collapse all files

16
ports/servoshell/egl/app_state.rs
View file

@ -7,7 +7,6 @@ use std::rc::Rc;
use dpi::PhysicalSize;
use ipc_channel::ipc::IpcSender;
use keyboard_types::{CompositionEvent, CompositionState};
use log::{debug, error, info, warn};
use raw_window_handle::{RawWindowHandle, WindowHandle};
use servo::base::id::WebViewId;
@ -16,11 +15,12 @@ use servo::servo_geometry::DeviceIndependentPixel;
use servo::webrender_api::ScrollLocation;
use servo::webrender_api::units::{DeviceIntRect, DeviceIntSize, DevicePixel};
use servo::{
AllowOrDenyRequest, ContextMenuResult, ImeEvent, InputEvent, InputMethodType, Key, KeyState,
KeyboardEvent, LoadStatus, MediaSessionActionType, MediaSessionEvent, MouseButton,
MouseButtonAction, MouseButtonEvent, MouseMoveEvent, NavigationRequest, PermissionRequest,
RenderingContext, ScreenGeometry, Servo, ServoDelegate, ServoError, SimpleDialog, TouchEvent,
TouchEventType, TouchId, WebView, WebViewBuilder, WebViewDelegate, WindowRenderingContext,
AllowOrDenyRequest, CompositionEvent, CompositionState, ContextMenuResult, ImeEvent,
InputEvent, InputMethodType, Key, KeyState, KeyboardEvent, LoadStatus, MediaSessionActionType,
MediaSessionEvent, MouseButton, MouseButtonAction, MouseButtonEvent, MouseMoveEvent, NamedKey,
NavigationRequest, PermissionRequest, RenderingContext, ScreenGeometry, Servo, ServoDelegate,
ServoError, SimpleDialog, TouchEvent, TouchEventType, TouchId, WebView, WebViewBuilder,
WebViewDelegate, WindowRenderingContext,
};
use url::Url;
@ -613,7 +613,7 @@ impl RunningAppState {
let active_webview = self.active_webview();
active_webview.notify_input_event(InputEvent::Keyboard(KeyboardEvent::from_state_and_key(
KeyState::Down,
Key::Process,
Key::Named(NamedKey::Process),
)));
active_webview.notify_input_event(InputEvent::Ime(ImeEvent::Composition(
CompositionEvent {
@ -623,7 +623,7 @@ impl RunningAppState {
)));
active_webview.notify_input_event(InputEvent::Keyboard(KeyboardEvent::from_state_and_key(
KeyState::Up,
Key::Process,
Key::Named(NamedKey::Process),
)));
self.perform_updates();
}

14
ports/servoshell/egl/ohos.rs
View file

@ -13,7 +13,7 @@ use std::thread;
use std::thread::sleep;
use std::time::Duration;
use keyboard_types::Key;
use keyboard_types::{Key, NamedKey};
use log::{LevelFilter, debug, error, info, trace, warn};
use napi_derive_ohos::{module_exports, napi};
use napi_ohos::bindgen_prelude::Function;
@ -185,19 +185,19 @@ impl ServoAction {
InsertText(text) => servo.ime_insert_text(text.clone()),
ImeDeleteForward(len) => {
for _ in 0..*len {
servo.key_down(Key::Delete);
servo.key_up(Key::Delete);
servo.key_down(Key::Named(NamedKey::Delete));
servo.key_up(Key::Named(NamedKey::Delete));
}
},
ImeDeleteBackward(len) => {
for _ in 0..*len {
servo.key_down(Key::Backspace);
servo.key_up(Key::Backspace);
servo.key_down(Key::Named(NamedKey::Backspace));
servo.key_up(Key::Named(NamedKey::Backspace));
}
},
ImeSendEnter => {
servo.key_down(Key::Enter);
servo.key_up(Key::Enter);
servo.key_down(Key::Named(NamedKey::Enter));
servo.key_up(Key::Named(NamedKey::Enter));
},
Initialize(_init_opts) => {
panic!("Received Initialize event, even though servo is already initialized")