s3rius/squeekboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

imservice: Limited scope of unsafe

Browse Source
This commit is contained in:
Dorota Czaplejewicz
2020-01-12 19:12:29 +00:00
parent 785717d477
commit e5d416fd4f
1 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/imservice.rs
View File

@ -38,7 +38,7 @@ pub mod c {
// TODO: is unsafe needed here? // TODO: is unsafe needed here?
#[no_mangle] #[no_mangle]
pub unsafe extern "C" pub extern "C"
fn imservice_handle_input_method_activate(imservice: *mut IMService, fn imservice_handle_input_method_activate(imservice: *mut IMService,
im: *const InputMethod) im: *const InputMethod)
{ {
@ -51,7 +51,7 @@ pub mod c {
} }
#[no_mangle] #[no_mangle]
pub unsafe extern "C" pub extern "C"
fn imservice_handle_input_method_deactivate(imservice: *mut IMService, fn imservice_handle_input_method_deactivate(imservice: *mut IMService,
im: *const InputMethod) im: *const InputMethod)
{ {
@ -63,7 +63,7 @@ pub mod c {
} }
#[no_mangle] #[no_mangle]
pub unsafe extern "C" pub extern "C"
fn imservice_handle_surrounding_text(imservice: *mut IMService, fn imservice_handle_surrounding_text(imservice: *mut IMService,
im: *const InputMethod, im: *const InputMethod,
text: *const c_char, cursor: u32, _anchor: u32) text: *const c_char, cursor: u32, _anchor: u32)
@ -79,7 +79,7 @@ pub mod c {
} }
#[no_mangle] #[no_mangle]
pub unsafe extern "C" pub extern "C"
fn imservice_handle_content_type(imservice: *mut IMService, fn imservice_handle_content_type(imservice: *mut IMService,
im: *const InputMethod, im: *const InputMethod,
hint: u32, purpose: u32) hint: u32, purpose: u32)
@ -103,7 +103,7 @@ pub mod c {
} }
#[no_mangle] #[no_mangle]
pub unsafe extern "C" pub extern "C"
fn imservice_handle_text_change_cause(imservice: *mut IMService, fn imservice_handle_text_change_cause(imservice: *mut IMService,
im: *const InputMethod, im: *const InputMethod,
cause: u32) cause: u32)
@ -121,7 +121,7 @@ pub mod c {
} }
#[no_mangle] #[no_mangle]
pub unsafe extern "C" pub extern "C"
fn imservice_handle_commit_state(imservice: *mut IMService, fn imservice_handle_commit_state(imservice: *mut IMService,
im: *const InputMethod) im: *const InputMethod)
{ {
@ -138,34 +138,38 @@ pub mod c {
if active_changed { if active_changed {
if imservice.current.active { if imservice.current.active {
if let Some(ui) = imservice.ui_manager { if let Some(ui) = imservice.ui_manager {
server_context_service_show_keyboard(ui); unsafe { server_context_service_show_keyboard(ui); }
}
unsafe {
eekboard_context_service_set_hint_purpose(
imservice.state_manager,
imservice.current.content_hint.bits(),
imservice.current.content_purpose.clone() as u32,
);
} }
eekboard_context_service_set_hint_purpose(
imservice.state_manager,
imservice.current.content_hint.bits(),
imservice.current.content_purpose.clone() as u32);
} else { } else {
if let Some(ui) = imservice.ui_manager { if let Some(ui) = imservice.ui_manager {
server_context_service_hide_keyboard(ui); unsafe { server_context_service_hide_keyboard(ui); }
} }
} }
} }
} }
// TODO: this is really untested
#[no_mangle] #[no_mangle]
pub unsafe extern "C" pub extern "C"
fn imservice_handle_unavailable(imservice: *mut IMService, fn imservice_handle_unavailable(imservice: *mut IMService,
im: *mut InputMethod) im: *mut InputMethod)
{ {
let imservice = check_imservice(imservice, im).unwrap(); let imservice = check_imservice(imservice, im).unwrap();
imservice_destroy_im(im); unsafe { imservice_destroy_im(im); }
// no need to care about proper double-buffering, // no need to care about proper double-buffering,
// the keyboard is already decommissioned // the keyboard is already decommissioned
imservice.current.active = false; imservice.current.active = false;
if let Some(ui) = imservice.ui_manager { if let Some(ui) = imservice.ui_manager {
server_context_service_hide_keyboard(ui); unsafe { server_context_service_hide_keyboard(ui); }
} }
} }